May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Always refresh rawinput device list when requested.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: c2c78a2fe0ac13e4fca7ab4c17977b65e358485c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c78a2fe0ac13e4fca7ab4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 4 10:24:52 2021 +0200 user32: Always refresh rawinput device list when requested. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 5c009624fe6..6172c500839 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -166,8 +166,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) static void find_devices(void) { - static ULONGLONG last_check; - SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; HIDD_ATTRIBUTES attr; @@ -176,10 +174,6 @@ static void find_devices(void) HDEVINFO set; DWORD idx; - if (GetTickCount64() - last_check < 2000) - return; - last_check = GetTickCount64(); - HidD_GetHidGuid(&hid_guid); EnterCriticalSection(&rawinput_devices_cs);

1 0

Jan Sikorski : d3d10core/tests: Test combined scissors and viewport with negative offsets.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 115808d1db71c7246d79185f0a7c119367aa02eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=115808d1db71c7246d79185f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue May 4 12:43:58 2021 +0200 d3d10core/tests: Test combined scissors and viewport with negative offsets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ccddb401aed..d23857a14bf 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5067,6 +5067,23 @@ static void test_scissor(void) color = get_texture_color(test_context.backbuffer, 320, 420); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + set_viewport(device, -1.0f, 0.0f, 641, 480, 0.0f, 1.0f); + SetRect(&scissor_rect, -1, 0, 640, 480); + ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_color_quad(&test_context, &green); + color = get_texture_color(test_context.backbuffer, 320, 60); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 80, 240); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 560, 240); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 420); + ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); + ID3D10RasterizerState_Release(rs); release_test_context(&test_context); }

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 64041e3e03660e6ed4f33410172678c32b8838a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64041e3e03660e6ed4f33410… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue May 4 17:04:00 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index 74dd20a4afe..6347c615a8f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-21 09:20+0200\n" +"PO-Revision-Date: 2021-05-04 16:50+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -571,7 +571,7 @@ msgstr "Opslaan als..." #: dlls/comdlg32/comdlg32.rc:193 dlls/comdlg32/comdlg32.rc:146 msgid "Save As" -msgstr "&Opslaan als" +msgstr "Opslaan als" #: dlls/comdlg32/comdlg32.rc:202 dlls/comdlg32/comdlg32.rc:211 #: dlls/comdlg32/comdlg32.rc:358 dlls/comdlg32/comdlg32.rc:55 @@ -3985,10 +3985,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' is geen datum object" +msgstr "'this' is geen Map object" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14799,10 +14797,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Kan de gegeven registersleutel niet vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Zebediah Figura : include: Factor out winetest_printf().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 2cdf6f0f303d8fb10b7f004857613cb87d304991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cdf6f0f303d8fb10b7f0048… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 25 15:09:31 2021 -0500 include: Factor out winetest_printf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 59 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 078b0147c4f..25a3222664b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -295,19 +295,32 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -void winetest_subtest( const char* name ) +static void winetest_vprintf( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s Subtest %s\n", - data->current_file, data->current_line, winetest_elapsed(), name ); + + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); + vprintf( msg, args ); +} + +static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void __winetest_cdecl winetest_printf( const char *msg, ... ) +{ + __winetest_va_list valist; + + __winetest_va_start( valist, msg ); + winetest_vprintf( msg, valist ); + __winetest_va_end( valist ); +} + +void winetest_subtest( const char* name ) +{ + winetest_printf( "Subtest %s\n", name ); } void winetest_ignore_exceptions( BOOL ignore ) { - struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s IgnoreExceptions=%d\n", - data->current_file, data->current_line, winetest_elapsed(), - ignore ? 1 : 0 ); + winetest_printf( "IgnoreExceptions=%d\n", ignore ? 1 : 0 ); } int broken( int condition ) @@ -327,9 +340,7 @@ static LONG winetest_add_line( void ) index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) - printf( "%s:%d:%s Line has been silenced after %d occurrences\n", - data->current_file, data->current_line, winetest_elapsed(), - winetest_mute_threshold ); + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); return count; } @@ -352,8 +363,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d:%s Test succeeded inside todo block: ", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test succeeded inside todo block: " ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -365,8 +375,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d:%s Test marked todo: ", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test marked todo: " ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -380,8 +389,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d:%s Test failed: ", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test failed: " ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; @@ -391,8 +399,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_report_success || (winetest_time && GetTickCount() >= winetest_last_time + 1000)) { - printf( "%s:%d:%s Test succeeded\n", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test succeeded\n" ); } InterlockedIncrement(&successes); return 1; @@ -417,10 +424,8 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) return; if (winetest_add_line() < winetest_mute_threshold) { - struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); - vprintf(msg, valist); + winetest_vprintf( msg, valist ); __winetest_va_end(valist); } else @@ -431,8 +436,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Tests skipped: " ); vprintf(msg, args); InterlockedIncrement(&skipped); } @@ -513,21 +517,16 @@ void winetest_wait_child_process( HANDLE process ) else { DWORD exit_code; - struct tls_data *data = get_tls_data(); GetExitCodeProcess( process, &exit_code ); if (exit_code > 255) { DWORD pid = GetProcessId( process ); - printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", - data->current_file, data->current_line, winetest_elapsed(), - exit_code, pid ); + winetest_printf( "unhandled exception %08x in child process %04x\n", exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { - printf( "%s:%d:%s %u failures in child process\n", - data->current_file, data->current_line, winetest_elapsed(), - exit_code ); + winetest_printf( "%u failures in child process\n", exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); }

1 0

Zebediah Figura : ws2_32/tests: Add some tests for WSAGetOverlappedResult() status mapping.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 9195da83b9289d61b9cf1de5dc7f7bdf61759905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9195da83b9289d61b9cf1de5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 3 21:42:54 2021 -0500 ws2_32/tests: Add some tests for WSAGetOverlappedResult() status mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60577d49984..627c12b8a1f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8573,6 +8573,149 @@ static void test_connecting_socket(void) closesocket(client); } +static DWORD map_status( NTSTATUS status ) +{ + static const struct + { + NTSTATUS status; + DWORD error; + } + errors[] = + { + {STATUS_PENDING, ERROR_IO_INCOMPLETE}, + + {STATUS_BUFFER_OVERFLOW, WSAEMSGSIZE}, + + {STATUS_NOT_IMPLEMENTED, WSAEOPNOTSUPP}, + {STATUS_ACCESS_VIOLATION, WSAEFAULT}, + {STATUS_PAGEFILE_QUOTA, WSAENOBUFS}, + {STATUS_INVALID_HANDLE, WSAENOTSOCK}, + {STATUS_NO_SUCH_DEVICE, WSAENETDOWN}, + {STATUS_NO_SUCH_FILE, WSAENETDOWN}, + {STATUS_NO_MEMORY, WSAENOBUFS}, + {STATUS_CONFLICTING_ADDRESSES, WSAENOBUFS}, + {STATUS_ACCESS_DENIED, WSAEACCES}, + {STATUS_BUFFER_TOO_SMALL, WSAEFAULT}, + {STATUS_OBJECT_TYPE_MISMATCH, WSAENOTSOCK}, + {STATUS_OBJECT_NAME_NOT_FOUND, WSAENETDOWN}, + {STATUS_OBJECT_PATH_NOT_FOUND, WSAENETDOWN}, + {STATUS_SHARING_VIOLATION, WSAEADDRINUSE}, + {STATUS_QUOTA_EXCEEDED, WSAENOBUFS}, + {STATUS_TOO_MANY_PAGING_FILES, WSAENOBUFS}, + {STATUS_INSUFFICIENT_RESOURCES, WSAENOBUFS}, + {STATUS_WORKING_SET_QUOTA, WSAENOBUFS}, + {STATUS_DEVICE_NOT_READY, WSAEWOULDBLOCK}, + {STATUS_PIPE_DISCONNECTED, WSAESHUTDOWN}, + {STATUS_IO_TIMEOUT, WSAETIMEDOUT}, + {STATUS_NOT_SUPPORTED, WSAEOPNOTSUPP}, + {STATUS_REMOTE_NOT_LISTENING, WSAECONNREFUSED}, + {STATUS_BAD_NETWORK_PATH, WSAENETUNREACH}, + {STATUS_NETWORK_BUSY, WSAENETDOWN}, + {STATUS_INVALID_NETWORK_RESPONSE, WSAENETDOWN}, + {STATUS_UNEXPECTED_NETWORK_ERROR, WSAENETDOWN}, + {STATUS_REQUEST_NOT_ACCEPTED, WSAEWOULDBLOCK}, + {STATUS_CANCELLED, ERROR_OPERATION_ABORTED}, + {STATUS_COMMITMENT_LIMIT, WSAENOBUFS}, + {STATUS_LOCAL_DISCONNECT, WSAECONNABORTED}, + {STATUS_REMOTE_DISCONNECT, WSAECONNRESET}, + {STATUS_REMOTE_RESOURCES, WSAENOBUFS}, + {STATUS_LINK_FAILED, WSAECONNRESET}, + {STATUS_LINK_TIMEOUT, WSAETIMEDOUT}, + {STATUS_INVALID_CONNECTION, WSAENOTCONN}, + {STATUS_INVALID_ADDRESS, WSAEADDRNOTAVAIL}, + {STATUS_INVALID_BUFFER_SIZE, WSAEMSGSIZE}, + {STATUS_INVALID_ADDRESS_COMPONENT, WSAEADDRNOTAVAIL}, + {STATUS_TOO_MANY_ADDRESSES, WSAENOBUFS}, + {STATUS_ADDRESS_ALREADY_EXISTS, WSAEADDRINUSE}, + {STATUS_CONNECTION_DISCONNECTED, WSAECONNRESET}, + {STATUS_CONNECTION_RESET, WSAECONNRESET}, + {STATUS_TRANSACTION_ABORTED, WSAECONNABORTED}, + {STATUS_CONNECTION_REFUSED, WSAECONNREFUSED}, + {STATUS_GRACEFUL_DISCONNECT, WSAEDISCON}, + {STATUS_CONNECTION_ACTIVE, WSAEISCONN}, + {STATUS_NETWORK_UNREACHABLE, WSAENETUNREACH}, + {STATUS_HOST_UNREACHABLE, WSAEHOSTUNREACH}, + {STATUS_PROTOCOL_UNREACHABLE, WSAENETUNREACH}, + {STATUS_PORT_UNREACHABLE, WSAECONNRESET}, + {STATUS_REQUEST_ABORTED, WSAEINTR}, + {STATUS_CONNECTION_ABORTED, WSAECONNABORTED}, + {STATUS_DATATYPE_MISALIGNMENT_ERROR,WSAEFAULT}, + {STATUS_HOST_DOWN, WSAEHOSTDOWN}, + {0x80070000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + {0xc0010000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + {0xc0070000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(errors); ++i) + { + if (errors[i].status == status) + return errors[i].error; + } + + return NT_SUCCESS(status) ? RtlNtStatusToDosErrorNoTeb(status) : WSAEINVAL; +} + +static void test_WSAGetOverlappedResult(void) +{ + OVERLAPPED overlapped = {0}; + DWORD size, flags; + NTSTATUS status; + unsigned int i; + SOCKET s; + BOOL ret; + + static const NTSTATUS ranges[][2] = + { + {0x0, 0x10000}, + {0x40000000, 0x40001000}, + {0x80000000, 0x80001000}, + {0x80070000, 0x80080000}, + {0xc0000000, 0xc0001000}, + {0xc0070000, 0xc0080000}, + {0xd0000000, 0xd0001000}, + {0xd0070000, 0xd0080000}, + }; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + for (i = 0; i < ARRAY_SIZE(ranges); ++i) + { + for (status = ranges[i][0]; status < ranges[i][1]; ++status) + { + BOOL expect_ret = NT_SUCCESS(status) && status != STATUS_PENDING; + DWORD expect = map_status(status); + + overlapped.Internal = status; + WSASetLastError(0xdeadbeef); + ret = WSAGetOverlappedResult(s, &overlapped, &size, FALSE, &flags); + todo_wine_if (expect_ret && status) + ok(ret == expect_ret, "status %#x: expected %d, got %d\n", status, expect_ret, ret); + if (ret) + { + ok(WSAGetLastError() == expect /* >= win10 1809 */ + || !WSAGetLastError() /* < win10 1809 */ + || WSAGetLastError() == 0xdeadbeef, /* < win7 */ + "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError()); + } + else + { + todo_wine_if (!NT_SUCCESS(status) + && LOWORD(status) != WSAEINVAL + && status != STATUS_CANCELLED + && status != (0x80070000 | ERROR_IO_INCOMPLETE) + && status != (0xc0070000 | ERROR_IO_INCOMPLETE)) + ok(WSAGetLastError() == expect + || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */ + "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError()); + } + } + } + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -8628,6 +8771,7 @@ START_TEST( sock ) test_address_list_query(); test_bind(); test_connecting_socket(); + test_WSAGetOverlappedResult(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Georg Lehmann : winevulkan: Override VK_USE_64_BIT_PTR_DEFINES instead of handle definition.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 9ca95e32651d6a50dc787af4dc53fb907f1c4e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ca95e32651d6a50dc787af4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sun Apr 25 13:22:14 2021 +0200 winevulkan: Override VK_USE_64_BIT_PTR_DEFINES instead of handle definition. A bit simpler and more consistent because currently VK_USE_64_BIT_PTR_DEFINES can be 1 but non dipatchable handles are always unit64_t. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 10 +++------- include/wine/vulkan.h | 24 +++++++++++++++++++----- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b1877acda17..76d5fa94155 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -319,15 +319,11 @@ class VkDefine(object): # <type category="define" name="some_name">some_value</type> name = define.attrib.get("name") - # We override behavior of VK_DEFINE_NON_DISPATCHABLE handle as the default + # We override behavior of VK_USE_64_BIT_PTR_DEFINES as the default non-dispatchable handle # definition various between 64-bit (uses pointers) and 32-bit (uses uint64_t). # This complicates TRACEs in the thunks, so just use uint64_t. - if name == "VK_DEFINE_NON_DISPATCHABLE_HANDLE": - value = "#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;" - # As VK_DEFINE_NON_DISPATCHABLE handle is overriden above, we must also override - # VK_NULL_HANDLE so that its type will match. - elif name == "VK_NULL_HANDLE": - value = "#define VK_NULL_HANDLE 0ULL" + if name == "VK_USE_64_BIT_PTR_DEFINES": + value = "#define VK_USE_64_BIT_PTR_DEFINES 0" else: value = define.text return VkDefine(name, value) diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index a9dfd0b593a..3638008315c 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -449,16 +449,30 @@ #define VK_HEADER_VERSION 176 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; +#define VK_USE_64_BIT_PTR_DEFINES 0 -#ifndef VK_USE_64_BIT_PTR_DEFINES -#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) -#define VK_USE_64_BIT_PTR_DEFINES 1 +#ifndef VK_DEFINE_NON_DISPATCHABLE_HANDLE +#if (VK_USE_64_BIT_PTR_DEFINES==1) +#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201103L)) +#define VK_NULL_HANDLE nullptr #else -#define VK_USE_64_BIT_PTR_DEFINES 0 -#endif +#define VK_NULL_HANDLE ((void*)0) #endif +#else #define VK_NULL_HANDLE 0ULL +#endif +#endif +#ifndef VK_NULL_HANDLE +#define VK_NULL_HANDLE 0 +#endif + +#ifndef VK_DEFINE_NON_DISPATCHABLE_HANDLE +#if (VK_USE_64_BIT_PTR_DEFINES==1) +#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object; +#else #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; +#endif +#endif VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkAccelerationStructureKHR) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkAccelerationStructureNV) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBuffer)

1 0

Paul Gofman : gamingtcui: Add stub for ProcessPendingGameUI().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: fb983276f7c39c48a4028012c7afc9e6948eda66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb983276f7c39c48a4028012… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 3 19:24:43 2021 +0300 gamingtcui: Add stub for ProcessPendingGameUI(). Based on a patch by Myah Caron. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-gaming-tcui-l1-1-0.spec | 2 +- dlls/gamingtcui/Makefile.in | 5 ++++ dlls/gamingtcui/gamingtcui.spec | 2 +- dlls/gamingtcui/gamingtcui_main.c | 35 ++++++++++++++++++++++ include/Makefile.in | 1 + include/gamingtcui.h | 35 ++++++++++++++++++++++ 6 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec b/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec index 586ff6069c9..6b683a963c1 100644 --- a/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec +++ b/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub ProcessPendingGameUI +@ stdcall ProcessPendingGameUI(long) gamingtcui.ProcessPendingGameUI @ stub ShowChangeFriendRelationshipUI @ stub ShowGameInviteUI @ stub ShowPlayerPickerUI diff --git a/dlls/gamingtcui/Makefile.in b/dlls/gamingtcui/Makefile.in index e5006486f22..cc89ce1fdb5 100644 --- a/dlls/gamingtcui/Makefile.in +++ b/dlls/gamingtcui/Makefile.in @@ -1 +1,6 @@ MODULE = gamingtcui.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + gamingtcui_main.c diff --git a/dlls/gamingtcui/gamingtcui.spec b/dlls/gamingtcui/gamingtcui.spec index c455bbb7d54..893c58423e4 100644 --- a/dlls/gamingtcui/gamingtcui.spec +++ b/dlls/gamingtcui/gamingtcui.spec @@ -2,7 +2,7 @@ @ stub CheckGamingPrivilegeSilentlyForUser @ stub CheckGamingPrivilegeWithUI @ stub CheckGamingPrivilegeWithUIForUser -@ stub ProcessPendingGameUI +@ stdcall ProcessPendingGameUI(long) @ stub ShowChangeFriendRelationshipUI @ stub ShowChangeFriendRelationshipUIForUser @ stub ShowCustomizeUserProfileUI diff --git a/dlls/gamingtcui/gamingtcui_main.c b/dlls/gamingtcui/gamingtcui_main.c new file mode 100644 index 00000000000..8c371a50ed2 --- /dev/null +++ b/dlls/gamingtcui/gamingtcui_main.c @@ -0,0 +1,35 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "gamingtcui.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gamingtcui); + +HRESULT WINAPI ProcessPendingGameUI(BOOL wait_for_completion) +{ + FIXME("wait_for_completion %#x stub.\n", wait_for_completion); + + return S_OK; +} diff --git a/include/Makefile.in b/include/Makefile.in index 0d9db037ca7..9822bce6bdd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -301,6 +301,7 @@ SOURCES = \ fontsub.h \ fusion.idl \ gameux.idl \ + gamingtcui.h \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ diff --git a/include/gamingtcui.h b/include/gamingtcui.h new file mode 100644 index 00000000000..cf55369d197 --- /dev/null +++ b/include/gamingtcui.h @@ -0,0 +1,35 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __WINE_GAMINGTCUI_H +#define __WINE_GAMINGTCUI_H + +#include <windows.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +HRESULT WINAPI ProcessPendingGameUI(BOOL wait_for_completion); + +#ifdef __cplusplus +} +#endif +#endif

1 0

Paul Gofman : gamingtcui: Add dll.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 8c0ced87bcec8bdc505bf844cc9247106ebd8c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0ced87bcec8bdc505bf844… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 3 19:24:42 2021 +0300 gamingtcui: Add dll. Based on a patch by Myah Caron. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++++ configure.ac | 2 ++ dlls/api-ms-win-gaming-tcui-l1-1-0/Makefile.in | 1 + .../api-ms-win-gaming-tcui-l1-1-0.spec | 7 ++++++ dlls/gamingtcui/Makefile.in | 1 + dlls/gamingtcui/gamingtcui.spec | 26 ++++++++++++++++++++++ tools/make_specfiles | 4 ++++ 7 files changed, 45 insertions(+) diff --git a/configure b/configure index ca517b1d31a..c77184d996c 100755 --- a/configure +++ b/configure @@ -1100,6 +1100,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_legacy_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 +enable_api_ms_win_gaming_tcui_l1_1_0 enable_api_ms_win_gdi_dpiinfo_l1_1_0 enable_api_ms_win_mm_joystick_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 @@ -1364,6 +1365,7 @@ enable_fontsub enable_fusion enable_fwpuclnt enable_gameux +enable_gamingtcui enable_gdi32 enable_gdiplus enable_glu32 @@ -20304,6 +20306,7 @@ wine_fn_config_makefile dlls/api-ms-win-eventing-controller-l1-1-0 enable_api_ms wine_fn_config_makefile dlls/api-ms-win-eventing-legacy-l1-1-0 enable_api_ms_win_eventing_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-gaming-tcui-l1-1-0 enable_api_ms_win_gaming_tcui_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-gdi-dpiinfo-l1-1-0 enable_api_ms_win_gdi_dpiinfo_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-mm-joystick-l1-1-0 enable_api_ms_win_mm_joystick_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 @@ -20647,6 +20650,7 @@ wine_fn_config_makefile dlls/fusion/tests enable_tests wine_fn_config_makefile dlls/fwpuclnt enable_fwpuclnt wine_fn_config_makefile dlls/gameux enable_gameux wine_fn_config_makefile dlls/gameux/tests enable_tests +wine_fn_config_makefile dlls/gamingtcui enable_gamingtcui wine_fn_config_makefile dlls/gdi.exe16 enable_win16 wine_fn_config_makefile dlls/gdi32 enable_gdi32 wine_fn_config_makefile dlls/gdi32/tests enable_tests diff --git a/configure.ac b/configure.ac index 46bbb8a70f8..b6e7b2e74f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2968,6 +2968,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventing-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-eventlog-legacy-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-gaming-tcui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-gdi-dpiinfo-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-joystick-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-misc-l1-1-1) @@ -3311,6 +3312,7 @@ WINE_CONFIG_MAKEFILE(dlls/fusion/tests) WINE_CONFIG_MAKEFILE(dlls/fwpuclnt) WINE_CONFIG_MAKEFILE(dlls/gameux) WINE_CONFIG_MAKEFILE(dlls/gameux/tests) +WINE_CONFIG_MAKEFILE(dlls/gamingtcui) WINE_CONFIG_MAKEFILE(dlls/gdi.exe16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/gdi32) WINE_CONFIG_MAKEFILE(dlls/gdi32/tests) diff --git a/dlls/api-ms-win-gaming-tcui-l1-1-0/Makefile.in b/dlls/api-ms-win-gaming-tcui-l1-1-0/Makefile.in new file mode 100644 index 00000000000..909e09b6301 --- /dev/null +++ b/dlls/api-ms-win-gaming-tcui-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-gaming-tcui-l1-1-0.dll diff --git a/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec b/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec new file mode 100644 index 00000000000..586ff6069c9 --- /dev/null +++ b/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec @@ -0,0 +1,7 @@ +@ stub ProcessPendingGameUI +@ stub ShowChangeFriendRelationshipUI +@ stub ShowGameInviteUI +@ stub ShowPlayerPickerUI +@ stub ShowProfileCardUI +@ stub ShowTitleAchievementsUI +@ stub TryCancelPendingGameUI diff --git a/dlls/gamingtcui/Makefile.in b/dlls/gamingtcui/Makefile.in new file mode 100644 index 00000000000..e5006486f22 --- /dev/null +++ b/dlls/gamingtcui/Makefile.in @@ -0,0 +1 @@ +MODULE = gamingtcui.dll diff --git a/dlls/gamingtcui/gamingtcui.spec b/dlls/gamingtcui/gamingtcui.spec new file mode 100644 index 00000000000..c455bbb7d54 --- /dev/null +++ b/dlls/gamingtcui/gamingtcui.spec @@ -0,0 +1,26 @@ +@ stub CheckGamingPrivilegeSilently +@ stub CheckGamingPrivilegeSilentlyForUser +@ stub CheckGamingPrivilegeWithUI +@ stub CheckGamingPrivilegeWithUIForUser +@ stub ProcessPendingGameUI +@ stub ShowChangeFriendRelationshipUI +@ stub ShowChangeFriendRelationshipUIForUser +@ stub ShowCustomizeUserProfileUI +@ stub ShowCustomizeUserProfileUIForUser +@ stub ShowFindFriendsUI +@ stub ShowFindFriendsUIForUser +@ stub ShowGameInfoUI +@ stub ShowGameInfoUIForUser +@ stub ShowGameInviteUI +@ stub ShowGameInviteUIForUser +@ stub ShowGameInviteUIWithContext +@ stub ShowGameInviteUIWithContextForUser +@ stub ShowPlayerPickerUI +@ stub ShowPlayerPickerUIForUser +@ stub ShowProfileCardUI +@ stub ShowProfileCardUIForUser +@ stub ShowTitleAchievementsUI +@ stub ShowTitleAchievementsUIForUser +@ stub ShowUserSettingsUI +@ stub ShowUserSettingsUIForUser +@ stub TryCancelPendingGameUI diff --git a/tools/make_specfiles b/tools/make_specfiles index 4a151545aa0..4e79d56667e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -483,6 +483,10 @@ my @dll_groups = "uxtheme", "ext-ms-win-uxtheme-themes-l1-1-0", ], + [ + "gamingtcui", + "api-ms-win-gaming-tcui-l1-1-0", + ], [ "bthprops.cpl", "irprops.cpl",

1 0

Zebediah Figura : ws2_32: Move namespace provider stubs to protocol.c.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: b9cfd6eddb721f297673a3649748586baec6b198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9cfd6eddb721f297673a364… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 3 21:42:52 2021 -0500 ws2_32: Move namespace provider stubs to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 337 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 333 ------------------------------------------------ 2 files changed, 337 insertions(+), 333 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9cfd6eddb721f297673…

1 0

Zebediah Figura : ws2_32: Move byte order conversion functions to protocol.c.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: ec6940cd3fd1f88e0365ae16e5ee9d2add445bd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6940cd3fd1f88e0365ae16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 3 21:42:51 2021 -0500 ws2_32: Move byte order conversion functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 97 -------------------------------------------------- 2 files changed, 90 insertions(+), 97 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index fe30f26db53..abbe5738b88 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -2022,3 +2022,93 @@ WS_u_long WINAPI WS_inet_addr( const char *cp ) if (!cp) return INADDR_NONE; return inet_addr( cp ); } + + +/*********************************************************************** + * htonl (ws2_32.8) + */ +WS_u_long WINAPI WS_htonl( WS_u_long hostlong ) +{ + return htonl( hostlong ); +} + + +/*********************************************************************** + * htons (ws2_32.9) + */ +WS_u_short WINAPI WS_htons( WS_u_short hostshort ) +{ + return htons( hostshort ); +} + + +/*********************************************************************** + * WSAHtonl (ws2_32.@) + */ +int WINAPI WSAHtonl( SOCKET s, WS_u_long hostlong, WS_u_long *netlong ) +{ + if (netlong) + { + *netlong = htonl( hostlong ); + return 0; + } + SetLastError( WSAEFAULT ); + return -1; +} + + +/*********************************************************************** + * WSAHtons (ws2_32.@) + */ +int WINAPI WSAHtons( SOCKET s, WS_u_short hostshort, WS_u_short *netshort ) +{ + if (netshort) + { + *netshort = htons( hostshort ); + return 0; + } + SetLastError( WSAEFAULT ); + return -1; +} + + +/*********************************************************************** + * ntohl (ws2_32.14) + */ +WS_u_long WINAPI WS_ntohl( WS_u_long netlong ) +{ + return ntohl( netlong ); +} + + +/*********************************************************************** + * ntohs (ws2_32.15) + */ +WS_u_short WINAPI WS_ntohs( WS_u_short netshort ) +{ + return ntohs( netshort ); +} + + +/*********************************************************************** + * WSANtohl (ws2_32.@) + */ +int WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long *hostlong ) +{ + if (!hostlong) return WSAEFAULT; + + *hostlong = ntohl( netlong ); + return 0; +} + + +/*********************************************************************** + * WSANtohs (ws2_32.@) + */ +int WINAPI WSANtohs( SOCKET s, WS_u_short netshort, WS_u_short *hostshort ) +{ + if (!hostshort) return WSAEFAULT; + + *hostshort = ntohs( netshort ); + return 0; +} diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d930d13bb6..3c63b93d737 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3837,78 +3837,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } /* end switch(level) */ } -/*********************************************************************** - * htonl (WS2_32.8) - */ -WS_u_long WINAPI WS_htonl(WS_u_long hostlong) -{ - return htonl(hostlong); -} - - -/*********************************************************************** - * htons (WS2_32.9) - */ -WS_u_short WINAPI WS_htons(WS_u_short hostshort) -{ - return htons(hostshort); -} - -/*********************************************************************** - * WSAHtonl (WS2_32.46) - * From MSDN description of error codes, this function should also - * check if WinSock has been initialized and the socket is a valid - * socket. But why? This function only translates a host byte order - * u_long into a network byte order u_long... - */ -int WINAPI WSAHtonl(SOCKET s, WS_u_long hostlong, WS_u_long *lpnetlong) -{ - if (lpnetlong) - { - *lpnetlong = htonl(hostlong); - return 0; - } - SetLastError(WSAEFAULT); - return SOCKET_ERROR; -} - -/*********************************************************************** - * WSAHtons (WS2_32.47) - * From MSDN description of error codes, this function should also - * check if WinSock has been initialized and the socket is a valid - * socket. But why? This function only translates a host byte order - * u_short into a network byte order u_short... - */ -int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort) -{ - - if (lpnetshort) - { - *lpnetshort = htons(hostshort); - return 0; - } - SetLastError(WSAEFAULT); - return SOCKET_ERROR; -} - - -/*********************************************************************** - * ntohl (WS2_32.14) - */ -WS_u_long WINAPI WS_ntohl(WS_u_long netlong) -{ - return ntohl(netlong); -} - - -/*********************************************************************** - * ntohs (WS2_32.15) - */ -WS_u_short WINAPI WS_ntohs(WS_u_short netshort) -{ - return ntohs(netshort); -} - static const char *debugstr_wsaioctl(DWORD code) { @@ -6544,31 +6472,6 @@ INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA return SOCKET_ERROR; } -/*********************************************************************** - * WSANtohl (WS2_32.64) - */ -INT WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long* lphostlong ) -{ - TRACE( "(%04lx 0x%08x %p)\n", s, netlong, lphostlong ); - - if (!lphostlong) return WSAEFAULT; - - *lphostlong = ntohl( netlong ); - return 0; -} - -/*********************************************************************** - * WSANtohs (WS2_32.65) - */ -INT WINAPI WSANtohs( SOCKET s, WS_u_short netshort, WS_u_short* lphostshort ) -{ - TRACE( "(%04lx 0x%08x %p)\n", s, netshort, lphostshort ); - - if (!lphostshort) return WSAEFAULT; - - *lphostshort = ntohs( netshort ); - return 0; -} /*********************************************************************** * WSAProviderConfigChange (WS2_32.66)

1 0