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

Piotr Caban : msvcrt: Fix round implementation when 24-bit precision is used.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: df9c11ffa8ddc3b4dbb22f6e304cba8cfcda8ada URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9c11ffa8ddc3b4dbb22f6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 3 14:01:57 2021 +0200 msvcrt: Fix round implementation when 24-bit precision is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a29ed5786e2..1da6a0162da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -87,14 +87,6 @@ static inline float fp_barrierf(float x) return y; } -#if _MSVCR_VER>=120 -static inline double fp_barrier(double x) -{ - volatile double y = x; - return y; -} -#endif - static inline double CDECL ret_nan( BOOL update_sw ) { double x = 1.0; @@ -4330,32 +4322,26 @@ short CDECL _dclass(double x) /********************************************************************* * round (MSVCR120.@) * - * Copied from musl: src/math/round.c + * Based on musl implementation: src/math/round.c */ double CDECL round(double x) { - static const double toint = 1 / DBL_EPSILON; + ULONGLONG llx = *(ULONGLONG*)&x, tmp; + int e = (llx >> 52 & 0x7ff) - 0x3ff; - ULONGLONG llx = *(ULONGLONG*)&x; - int e = llx >> 52 & 0x7ff; - double y; + if (e >= 52) + return x; + if (e < -1) + return 0 * x; + else if (e == -1) + return signbit(x) ? -1 : 1; - if (e >= 0x3ff + 52) + tmp = 0x000fffffffffffffULL >> e; + if (!(llx & tmp)) return x; - if (llx >> 63) - x = -x; - if (e < 0x3ff - 1) - return 0 * *(double*)&llx; - y = fp_barrier(x + toint) - toint - x; - if (y > 0.5) - y = y + x - 1; - else if (y <= -0.5) - y = y + x + 1; - else - y = y + x; - if (llx >> 63) - y = -y; - return y; + llx += 0x0008000000000000ULL >> e; + llx &= ~tmp; + return *(double*)&llx; } /*********************************************************************

1 0

Zebediah Figura : ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 4084200765d4dd085d73910ee035d009ad81a554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4084200765d4dd085d73910e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 1 17:23:16 2021 -0500 ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE. Fixes a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9fe4cd03175..5e2520a3e12 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1537,7 +1537,8 @@ static void test_hid_device(void) todo_wine ok(found, "didn't find device\n"); - file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); CloseHandle(file);

1 0

Sven Baars : ntdll: Fix some memory leaks (Valgrind).
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 2d218c924dec978f3ac41e5ab771d944f3c63491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d218c924dec978f3ac41e5a… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 2 16:36:19 2021 +0200 ntdll: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/file.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index fc5c462e04f..3ac1ed9ab63 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -912,7 +912,7 @@ static void rebuild_argv(void) */ static void prepend_argv( const char **args, int count ) { - char **new_argv = malloc( (main_argc + count) * sizeof(*new_argv) ); + char **new_argv; char *p, *end; BOOL write_strings = FALSE; int i, total = 0, new_argc = main_argc + count - 1; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 2f18325fb90..c033bb06fa3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3298,7 +3298,12 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char /* check if prefix exists (except for DOS drives to avoid extra stat calls) */ - if (wcschr( prefix, '/' )) return STATUS_OBJECT_PATH_NOT_FOUND; + if (wcschr( prefix, '/' )) + { + free( unix_name ); + return STATUS_OBJECT_PATH_NOT_FOUND; + } + if (prefix_len != 2 || prefix[1] != ':') { unix_name[pos] = 0;

1 0

Hugh McMaster : reg: Add or modify the (Default) registry value if [/v] is not specified.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: a0dc4d7ce37fa8cc515cd4c908245d12fc07cfae URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dc4d7ce37fa8cc515cd4c9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:20:35 2021 +1000 reg: Add or modify the (Default) registry value if [/v] is not specified. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 63 +++++++++++++++++++++++------------------------- programs/reg/tests/add.c | 30 +++++++++++------------ 2 files changed, 45 insertions(+), 48 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index c3dec2d5b7f..897c6f60621 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -154,6 +154,8 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; + DWORD data_type, data_size; + BYTE *reg_data = NULL; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) @@ -162,49 +164,44 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - if (value_name || value_empty || data) + if (!force) { - DWORD reg_type; - DWORD data_size = 0; - BYTE* reg_data = NULL; - - if (!force) + if (RegQueryValueExW(hkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - if (RegQueryValueExW(hkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) { - if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) - { - RegCloseKey(hkey); - output_message(STRING_CANCELLED); - return 0; - } + RegCloseKey(hkey); + output_message(STRING_CANCELLED); + return 0; } } + } - reg_type = wchar_get_type(type); - if (reg_type == ~0u) - { - RegCloseKey(hkey); - output_message(STRING_UNSUPPORTED_TYPE, type); - return 1; - } - if ((reg_type == REG_DWORD || reg_type == REG_DWORD_BIG_ENDIAN) && !data) - { - RegCloseKey(hkey); - output_message(STRING_INVALID_CMDLINE); - return 1; - } + data_type = wchar_get_type(type); - if (!(reg_data = get_regdata(data, reg_type, separator, &data_size))) - { - RegCloseKey(hkey); - return 1; - } + if (data_type == ~0u) + { + RegCloseKey(hkey); + output_message(STRING_UNSUPPORTED_TYPE, type); + return 1; + } - RegSetValueExW(hkey, value_name, 0, reg_type, reg_data, data_size); - free(reg_data); + if ((data_type == REG_DWORD || data_type == REG_DWORD_BIG_ENDIAN) && !data) + { + RegCloseKey(hkey); + output_message(STRING_INVALID_CMDLINE); + return 1; } + if (!(reg_data = get_regdata(data, data_type, separator, &data_size))) + { + RegCloseKey(hkey); + return 1; + } + + RegSetValueExW(hkey, value_name, 0, data_type, reg_data, data_size); + free(reg_data); + RegCloseKey(hkey); output_message(STRING_SUCCESS); diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 23d0115fd64..7fad8333ed5 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -330,8 +330,8 @@ static void test_add(void) open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_WRITE, &hkey); /* The Default value is initialized if no parameters are specified */ - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + delete_value(hkey, NULL); /* This also occurs when specifying a registry type and passing data */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /d 0x5 /f", &r); @@ -342,7 +342,7 @@ static void test_add(void) /* The Default value can also be overwritten as an empty string */ run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -366,8 +366,8 @@ static void test_add(void) /* ... but we can add it without passing [/f] to reg.exe */ run_reg_exe("reg add HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + delete_value(hkey, NULL); /* Test whether overwriting a registry key modifies existing keys and values */ add_key(hkey, "Subkey", NULL); @@ -382,7 +382,7 @@ static void test_add(void) verify_key(hkey, "Subkey"); verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); verify_reg(hkey, "Test2", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_NONE /d Test /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -406,9 +406,9 @@ static void test_reg_none(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); + verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -435,7 +435,7 @@ static void test_reg_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -513,9 +513,9 @@ static void test_reg_expand_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -556,9 +556,9 @@ static void test_reg_binary(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); + verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -754,9 +754,9 @@ static void test_reg_multi_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); - todo_wine delete_value(hkey, NULL); + delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Hugh McMaster : reg: Only prompt the user to overwrite registry data if the given key already exists and [/f] is not supplied.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: cf1e6d3f3fcb726062b957a973bb0a78b7e00eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1e6d3f3fcb726062b957a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 3 23:20:37 2021 +1000 reg: Only prompt the user to overwrite registry data if the given key already exists and [/f] is not supplied. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 258e3e8cb25..9aaa3fc1acc 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -154,18 +154,18 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; - DWORD data_type, data_size; + DWORD dispos, data_type, data_size; BYTE *reg_data = NULL; LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) + KEY_READ|KEY_WRITE, NULL, &hkey, &dispos)) { output_message(STRING_ACCESS_DENIED); return 1; } - if (!force) + if (!force && dispos == REG_OPENED_EXISTING_KEY) { if (RegQueryValueExW(hkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {

1 0

Zebediah Figura : ws2_32: Move host lookup functions to protocol.c.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: ec9f3119306e34f5a8bd3bfeb233eed740c1c6ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9f3119306e34f5a8bd3bfe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:09:59 2021 -0500 ws2_32: Move host lookup 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 | 491 ++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 516 +------------------------------------------ dlls/ws2_32/ws2_32_private.h | 29 ++- 3 files changed, 520 insertions(+), 516 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec9f3119306e34f5a8bd…

1 0

Paul Gofman : winex11.drv: Handle Vulkan surface creation with NULL hwnd.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 011fabb2c43d13402ea18b6ea7be3669b5e6c7a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=011fabb2c43d13402ea18b6e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 3 13:26:27 2021 +0300 winex11.drv: Handle Vulkan surface creation with NULL hwnd. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 112 +++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/vulkan.c | 38 +++++++++++---- dlls/winex11.drv/window.c | 18 +++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 158 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=011fabb2c43d13402ea1…

1 0

Ziqing Hui : windowscodecs: Implement DdsEncoder_Initialize.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 0500d4906b4003d044ad3fab8f2df6a8f755c9c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0500d4906b4003d044ad3fab… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 1 11:14:50 2021 +0800 windowscodecs: Implement DdsEncoder_Initialize. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 31 ++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/ddsformat.c | 4 ---- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index ef6571842dd..e8a4f0e5c28 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -1754,10 +1754,35 @@ static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface) } static HRESULT WINAPI DdsEncoder_Initialize(IWICBitmapEncoder *iface, - IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) + IStream *stream, WICBitmapEncoderCacheOption cacheOption) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p,%u)\n", iface, stream, cacheOption); + + if (cacheOption != WICBitmapEncoderNoCache) + FIXME("Cache option %#x is not supported.\n", cacheOption); + + if (!stream) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + This->stream = stream; + IStream_AddRef(stream); + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI DdsEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index a5f1d6754a9..16adbb92726 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1287,11 +1287,9 @@ static void test_dds_encoder_initialize(void) if (!encoder) goto end; hr = IWICBitmapEncoder_Initialize(encoder, NULL, WICBitmapEncoderNoCache); - todo_wine ok(hr == E_INVALIDARG, "Initialize got unexpected hr %#x\n", hr); hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - todo_wine ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); IWICBitmapEncoder_Release(encoder); @@ -1302,11 +1300,9 @@ static void test_dds_encoder_initialize(void) if (!encoder) goto end; hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - todo_wine ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "Initialize got unexpected hr %#x\n", hr); end:

1 0

Serge Gautherie : winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: e19ad98564295354e36df473c278167b4ef72d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19ad98564295354e36df473… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon May 3 13:29:39 2021 +0200 winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 11a92fa84d9..5e35c31a3b7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -679,6 +679,7 @@ typedef struct _PROCESS_INFORMATION{ #define PROFILE_USER 0x10000000 #define PROFILE_KERNEL 0x20000000 #define PROFILE_SERVER 0x40000000 +#define CREATE_IGNORE_SYSTEM_DEFAULT 0x80000000 #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000

1 0

Zebediah Figura : ws2_32: Move name info functions to protocol.c.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 877e3e24d4c76146f5613b0a9b3b70b25b007a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877e3e24d4c76146f5613b0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:10:00 2021 -0500 ws2_32: Move name info 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 | 87 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 83 +----------------------------------------- dlls/ws2_32/ws2_32_private.h | 8 ++++ 3 files changed, 97 insertions(+), 81 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 460f4e78dcc..c2e661c03dc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -854,6 +854,93 @@ void WINAPI FreeAddrInfoExW( ADDRINFOEXW *ai ) } +static const int ws_niflag_map[][2] = +{ + MAP_OPTION( NI_NOFQDN ), + MAP_OPTION( NI_NUMERICHOST ), + MAP_OPTION( NI_NAMEREQD ), + MAP_OPTION( NI_NUMERICSERV ), + MAP_OPTION( NI_DGRAM ), +}; + +static int convert_niflag_w2u( int winflags ) +{ + unsigned int i; + int unixflags = 0; + + for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) + { + if (ws_niflag_map[i][0] & winflags) + { + unixflags |= ws_niflag_map[i][1]; + winflags &= ~ws_niflag_map[i][0]; + } + } + if (winflags) + FIXME("Unhandled windows NI_xxx flags 0x%x\n", winflags); + return unixflags; +} + + +/*********************************************************************** + * getnameinfo (ws2_32.@) + */ +int WINAPI WS_getnameinfo( const SOCKADDR *addr, WS_socklen_t addr_len, char *host, + DWORD host_len, char *serv, DWORD serv_len, int flags ) +{ +#ifdef HAVE_GETNAMEINFO + int ret; + union generic_unix_sockaddr uaddr; + unsigned int uaddr_len; + + TRACE( "addr %s, addr_len %d, host %p, host_len %u, serv %p, serv_len %d, flags %#x\n", + debugstr_sockaddr(addr), addr_len, host, host_len, serv, serv_len, flags ); + + uaddr_len = ws_sockaddr_ws2u( addr, addr_len, &uaddr ); + if (!uaddr_len) + { + SetLastError( WSAEFAULT ); + return WSA_NOT_ENOUGH_MEMORY; + } + ret = getnameinfo( &uaddr.addr, uaddr_len, host, host_len, serv, serv_len, convert_niflag_w2u(flags) ); + return convert_eai_u2w( ret ); +#else + FIXME( "getnameinfo() failed, not found during buildtime.\n" ); + return EAI_FAIL; +#endif +} + + +/*********************************************************************** + * GetNameInfoW (ws2_32.@) + */ +int WINAPI GetNameInfoW( const SOCKADDR *addr, WS_socklen_t addr_len, WCHAR *host, + DWORD host_len, WCHAR *serv, DWORD serv_len, int flags ) +{ + int ret; + char *hostA = NULL, *servA = NULL; + + if (host && (!(hostA = HeapAlloc( GetProcessHeap(), 0, host_len )))) + return EAI_MEMORY; + if (serv && (!(servA = HeapAlloc( GetProcessHeap(), 0, serv_len )))) + { + HeapFree( GetProcessHeap(), 0, hostA ); + return EAI_MEMORY; + } + + ret = WS_getnameinfo( addr, addr_len, hostA, host_len, servA, serv_len, flags ); + if (!ret) + { + if (host) MultiByteToWideChar( CP_ACP, 0, hostA, -1, host, host_len ); + if (serv) MultiByteToWideChar( CP_ACP, 0, servA, -1, serv, serv_len ); + } + + HeapFree( GetProcessHeap(), 0, hostA ); + HeapFree( GetProcessHeap(), 0, servA ); + return ret; +} + + static UINT host_errno_from_unix( int err ) { WARN( "%d\n", err ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7313741e4b1..5ced4720558 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -235,12 +235,6 @@ static unsigned int if_addr_cache_size; static SOCKET *socket_list; static unsigned int socket_list_size; -union generic_unix_sockaddr -{ - struct sockaddr addr; - char data[128]; /* should be big enough for all families */ -}; - const char *debugstr_sockaddr( const struct WS_sockaddr *a ) { if (!a) return "(nil)"; @@ -717,15 +711,6 @@ static const int ws_socktype_map[][2] = {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; -static const int ws_niflag_map[][2] = -{ - MAP_OPTION( NI_NOFQDN ), - MAP_OPTION( NI_NUMERICHOST ), - MAP_OPTION( NI_NAMEREQD ), - MAP_OPTION( NI_NUMERICSERV ), - MAP_OPTION( NI_DGRAM ), -}; - static const int ws_poll_map[][2] = { MAP_OPTION( POLLERR ), @@ -1633,8 +1618,8 @@ static inline BOOL supported_pf(int pf) /* Returns the length of the converted address if successful, 0 if it was too * small to start with or unknown family or invalid address buffer. */ -static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, - union generic_unix_sockaddr *uaddr) +unsigned int ws_sockaddr_ws2u( const struct WS_sockaddr *wsaddr, int wsaddrlen, + union generic_unix_sockaddr *uaddr ) { unsigned int uaddrlen = 0; @@ -5860,70 +5845,6 @@ struct WS_servent* WINAPI WS_getservbyname(const char *name, const char *proto) return retval; } -static int convert_niflag_w2u(int winflags) { - unsigned int i; - int unixflags = 0; - - for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) - if (ws_niflag_map[i][0] & winflags) { - unixflags |= ws_niflag_map[i][1]; - winflags &= ~ws_niflag_map[i][0]; - } - if (winflags) - FIXME("Unhandled windows NI_xxx flags 0x%x\n", winflags); - return unixflags; -} - -int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, - DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) -{ -#ifdef HAVE_GETNAMEINFO - int ret; - union generic_unix_sockaddr sa_u; - unsigned int size; - - TRACE("%s %d %p %d %p %d %d\n", debugstr_sockaddr(sa), salen, host, hostlen, - serv, servlen, flags); - - size = ws_sockaddr_ws2u(sa, salen, &sa_u); - if (!size) - { - SetLastError(WSAEFAULT); - return WSA_NOT_ENOUGH_MEMORY; - } - ret = getnameinfo(&sa_u.addr, size, host, hostlen, serv, servlen, convert_niflag_w2u(flags)); - return convert_eai_u2w(ret); -#else - FIXME("getnameinfo() failed, not found during buildtime.\n"); - return EAI_FAIL; -#endif -} - -int WINAPI GetNameInfoW(const SOCKADDR *sa, WS_socklen_t salen, PWCHAR host, - DWORD hostlen, PWCHAR serv, DWORD servlen, INT flags) -{ - int ret; - char *hostA = NULL, *servA = NULL; - - if (host && (!(hostA = HeapAlloc(GetProcessHeap(), 0, hostlen)))) return EAI_MEMORY; - if (serv && (!(servA = HeapAlloc(GetProcessHeap(), 0, servlen)))) - { - HeapFree(GetProcessHeap(), 0, hostA); - return EAI_MEMORY; - } - - ret = WS_getnameinfo(sa, salen, hostA, hostlen, servA, servlen, flags); - if (!ret) - { - if (host) MultiByteToWideChar(CP_ACP, 0, hostA, -1, host, hostlen); - if (serv) MultiByteToWideChar(CP_ACP, 0, servA, -1, serv, servlen); - } - - HeapFree(GetProcessHeap(), 0, hostA); - HeapFree(GetProcessHeap(), 0, servA); - return ret; -} - /*********************************************************************** * getservbyport (WS2_32.56) */ diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 121ce25ad1d..e86a3569510 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -161,11 +161,19 @@ static const char magic_loopback_addr[] = {127, 12, 34, 56}; +union generic_unix_sockaddr +{ + struct sockaddr addr; + char data[128]; /* should be big enough for all families */ +}; + int convert_eai_u2w( int ret ) DECLSPEC_HIDDEN; int convert_socktype_u2w( int type ) DECLSPEC_HIDDEN; int convert_socktype_w2u( int type ) DECLSPEC_HIDDEN; int ws_sockaddr_u2ws( const struct sockaddr *unix_addr, struct WS_sockaddr *win_addr, int *win_addr_len ) DECLSPEC_HIDDEN; +unsigned int ws_sockaddr_ws2u( const struct WS_sockaddr *win_addr, int win_addr_len, + union generic_unix_sockaddr *unix_addr ) DECLSPEC_HIDDEN; const char *debugstr_sockaddr( const struct WS_sockaddr *addr ) DECLSPEC_HIDDEN;

1 0