June 2021 - Wine-commits - list.winehq.org

Rémi Bernon : d2d1: Use D3DDeviceContextState instead of D3D10 state block.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 8c9354926204242cde714a51e5283bc3aac55837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9354926204242cde714a51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:17:36 2021 +0200 d2d1: Use D3DDeviceContextState instead of D3D10 state block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 23 ++++---- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 146 ++++++++++++----------------------------------- 3 files changed, 48 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c9354926204242cde71…

1 0

Rémi Bernon : d2d1: Remove unused D3D10 interfaces.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: e6603ae4e74463e925ca9e28706575de6be30226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6603ae4e74463e925ca9e28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:17:37 2021 +0200 d2d1: Remove unused D3D10 interfaces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 43 ++++++++------------------ dlls/d2d1/brush.c | 34 +++++++-------------- dlls/d2d1/d2d1_private.h | 15 +++------ dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/device.c | 73 +++++++++++++++++++------------------------- dlls/d2d1/tests/d2d1.c | 5 +-- 6 files changed, 62 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6603ae4e74463e925ca…

1 0

Hugh McMaster : reg: Support use of registry views when deleting registry values.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 8d42cb9c1ca72e02b8961d6703aaa2e3ddfda5e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d42cb9c1ca72e02b8961d67… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 28 22:57:46 2021 +1000 reg: Support use of registry views when deleting registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 22 ++++++++++++++++++---- programs/reg/tests/delete.c | 28 ++++++++++++++-------------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 8804e16e52f..f6965493faa 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -35,7 +35,7 @@ static void output_error(LONG rc) } } -static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { LONG rc; @@ -72,7 +72,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name return 0; } - if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))) + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE|sam, &hkey))) { output_error(rc); return 1; @@ -132,6 +132,7 @@ int reg_delete(int argc, WCHAR *argvW[]) HKEY root; WCHAR *path, *key_name, *value_name = NULL; BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (!parse_registry_key(argvW[2], &root, &path)) @@ -158,8 +159,18 @@ int reg_delete(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -181,9 +192,12 @@ int reg_delete(int argc, WCHAR *argvW[]) if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) goto invalid; + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + key_name = get_long_key(root, path); - return run_delete(root, path, key_name, value_name, value_empty, value_all, force); + return run_delete(root, path, sam, key_name, value_name, value_empty, value_all, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index d6a3b7e1d04..102fc0d788a 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -270,17 +270,17 @@ static void test_registry_view_win64(void) open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "DWORD"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "DWORD"); run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, NULL); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, NULL); run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "String"); - todo_wine verify_reg_nonexist(hkey, "Multiple Strings"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "String"); + verify_reg_nonexist(hkey, "Multiple Strings"); verify_key(hkey, "Subkey", KEY_WOW64_32KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:32", &r); @@ -380,17 +380,17 @@ static void test_registry_view_wow64(void) open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "DWORD"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "DWORD"); run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, NULL); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, NULL); run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "String"); - todo_wine verify_reg_nonexist(hkey, "Multiple Strings"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "String"); + verify_reg_nonexist(hkey, "Multiple Strings"); verify_key(hkey, "Subkey", KEY_WOW64_64KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:64", &r);

1 0

Hugh McMaster : reg: Support use of registry views when deleting registry keys.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 31f070f7d3e312942d72e774a4a7dbd21b655a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f070f7d3e312942d72e774… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 28 22:57:47 2021 +1000 reg: Support use of registry views when deleting registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 18 +++++++++++------- programs/reg/tests/delete.c | 18 +++++++++--------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index f6965493faa..cf0108664fd 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -59,25 +59,29 @@ static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR } } + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE|sam, &hkey))) + { + output_error(rc); + return 1; + } + /* Delete registry key if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if ((rc = RegDeleteTreeW(root, path))) + if ((rc = RegDeleteTreeW(hkey, NULL))) { + RegCloseKey(hkey); output_error(rc); return 1; } + RegDeleteKeyW(hkey, L""); + RegCloseKey(hkey); + output_message(STRING_SUCCESS); return 0; } - if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE|sam, &hkey))) - { - output_error(rc); - return 1; - } - op_delete_key = FALSE; if (value_all) diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 102fc0d788a..0c313c12a31 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -284,19 +284,19 @@ static void test_registry_view_win64(void) verify_key(hkey, "Subkey", KEY_WOW64_32KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(hkey, "Subkey", KEY_WOW64_32KEY); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey", KEY_WOW64_32KEY); close_key(hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); /* Test deletion from the 64-bit registry view (64-bit Windows) */ create_test_key(KEY_WOW64_64KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); @@ -394,14 +394,14 @@ static void test_registry_view_wow64(void) verify_key(hkey, "Subkey", KEY_WOW64_64KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(hkey, "Subkey", KEY_WOW64_64KEY); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey", KEY_WOW64_64KEY); close_key(hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); } START_TEST(delete)

1 0

Hugh McMaster : reg/tests: Split 'query' syntax tests into a separate function.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: a899d743c585fe8004c41f12cf0a080ebe622fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a899d743c585fe8004c41f12… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 28 22:57:48 2021 +1000 reg/tests: Split 'query' syntax tests into a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 54 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 270f0aad75d..f5ba32f97e3 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -105,6 +105,35 @@ static void compare_query_(const char *file, unsigned line, const BYTE *buf, /* Unit tests */ +static void test_command_syntax(void) +{ + DWORD r; + + run_reg_exe("reg query", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query -H", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /v Test2", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + static void test_query(void) { const char *test1 = "\r\n" @@ -167,18 +196,6 @@ static void test_query(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); - run_reg_exe("reg query", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg query /?", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg query /h", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg query -H", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - /* Key not present */ run_reg_exe("reg query HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -188,21 +205,9 @@ static void test_query(void) add_value(hkey, "Test1", REG_SZ, "Hello, World", 13); add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /v Test2", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test1, FALSE, 0); @@ -300,5 +305,6 @@ START_TEST(query) return; } + test_command_syntax(); test_query(); }

1 0

Jacek Caban : include: Add proofofpossessioncookieinfo.idl file.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 4cf888007f08ba3a3d72bc3d4712085756e40ec6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cf888007f08ba3a3d72bc3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 16:20:41 2021 +0200 include: Add proofofpossessioncookieinfo.idl file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/proofofpossessioncookieinfo.idl | 70 +++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4a8c261bb8f..e6477d13cef 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -581,6 +581,7 @@ SOURCES = \ powrprof.h \ prntvpt.h \ profinfo.h \ + proofofpossessioncookieinfo.idl \ propidl.idl \ propkey.h \ propkeydef.h \ diff --git a/include/proofofpossessioncookieinfo.idl b/include/proofofpossessioncookieinfo.idl new file mode 100644 index 00000000000..3d639523e8a --- /dev/null +++ b/include/proofofpossessioncookieinfo.idl @@ -0,0 +1,70 @@ +/* + * Copyright 2021 Jacek Caban 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef struct ProofOfPossessionCookieInfo +{ + LPWSTR name; + LPWSTR data; + DWORD flags; + LPWSTR p3pHeader; +} ProofOfPossessionCookieInfo; + + +cpp_quote("static inline void FreeProofOfPossessionCookieInfoArray(ProofOfPossessionCookieInfo *cookie_info, DWORD count)") +cpp_quote("{") +cpp_quote(" unsigned int i;") +cpp_quote(" for (i = 0; i < count; i++)") +cpp_quote(" {") +cpp_quote(" CoTaskMemFree(cookie_info[i].name);") +cpp_quote(" CoTaskMemFree(cookie_info[i].data);") +cpp_quote(" CoTaskMemFree(cookie_info[i].p3pHeader);") +cpp_quote(" }") +cpp_quote(" CoTaskMemFree(cookie_info);") +cpp_quote("}") + + +[ + object, + uuid(cdaece56-4edf-43df-b113-88e4556fa1bb), + pointer_default(unique) +] +interface IProofOfPossessionCookieInfoManager : IUnknown +{ + HRESULT GetCookieInfoForUri([in] LPCWSTR uri, + [out] DWORD *cookieInfoCount, + [out, size_is(,*cookieInfoCount)] ProofOfPossessionCookieInfo **cookieInfo); +} + + +[ + uuid(7681a019-8f51-4594-9507-f27040f71f01), + version(1.0) +] +library ProofOfPossessionCookieInfoManagerLib +{ + [ + uuid(a9927f85-a304-4390-8b23-a75f1c668600) + ] + coclass ProofOfPossessionCookieInfoManager + { + [default] interface IProofOfPossessionCookieInfoManager; + } +}

1 0

Jacek Caban : conhost: Silence FIXME in console_input_ioctl.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 8dfcc1e3bc97e67fa4a329299e29feb8e5d1b8e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dfcc1e3bc97e67fa4a32929… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 17:32:38 2021 +0200 conhost: Silence FIXME in console_input_ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 86dadad9277..7db1261d3be 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2565,8 +2565,8 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; default: - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + WARN( "unsupported ioctl %x\n", code ); + return STATUS_INVALID_HANDLE; } }

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_SET_SO_RCVBUF.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: b83a8b2da552d63274aeacb3d0097c34f1334249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b83a8b2da552d63274aeacb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 20:21:05 2021 -0500 server: Introduce IOCTL_AFD_WINE_SET_SO_RCVBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index ae5a0584bdc..99df0b8d65e 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -169,6 +169,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index e7754dc0da3..aaac693d098 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2580,6 +2580,22 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_SET_SO_RCVBUF: + { + DWORD rcvbuf; + + if (get_req_data_size() < sizeof(rcvbuf)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + rcvbuf = *(DWORD *)get_req_data(); + + if (setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, sizeof(rcvbuf) ) < 0) + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_RCVBUF.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 1a2b1d75a8543d742b69f0481a5ea14bcd2124e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a2b1d75a8543d742b69f048… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 20:21:06 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_SO_RCVBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 99df0b8d65e..0692394459e 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -170,6 +170,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index aaac693d098..8bad31efdd1 100644 --- a/server/sock.c +++ b/server/sock.c @@ -207,6 +207,7 @@ struct sock struct connect_req *connect_req; /* pending connection request */ union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ + unsigned int rcvbuf; /* advisory recv buffer size */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ @@ -1386,6 +1387,7 @@ static struct sock *create_socket(void) sock->wr_shutdown_pending = 0; sock->nonblocking = 0; sock->bound = 0; + sock->rcvbuf = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -1477,7 +1479,8 @@ static void set_dont_fragment( int fd, int level, int value ) static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { unsigned int options = 0; - int sockfd, unix_type, unix_family, unix_protocol; + int sockfd, unix_type, unix_family, unix_protocol, value; + socklen_t len; unix_family = get_unix_family( family ); unix_type = get_unix_type( type ); @@ -1543,6 +1546,10 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u } #endif + len = sizeof(value); + if (!getsockopt( sockfd, SOL_SOCKET, SO_RCVBUF, &value, &len )) + sock->rcvbuf = value; + sock->state = (type == WS_SOCK_STREAM ? SOCK_UNCONNECTED : SOCK_CONNECTIONLESS); sock->flags = flags; sock->proto = protocol; @@ -2580,6 +2587,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_SO_RCVBUF: + { + int rcvbuf = sock->rcvbuf; + + if (get_reply_max_size() < sizeof(rcvbuf)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &rcvbuf, sizeof(rcvbuf) ); + return 1; + } + case IOCTL_AFD_WINE_SET_SO_RCVBUF: { DWORD rcvbuf; @@ -2591,7 +2612,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } rcvbuf = *(DWORD *)get_req_data(); - if (setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, sizeof(rcvbuf) ) < 0) + if (!setsockopt( unix_fd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, sizeof(rcvbuf) )) + sock->rcvbuf = rcvbuf; + else set_error( sock_get_ntstatus( errno ) ); return 0; }

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SET_SO_RCVBUF.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 388e7a76558aeeed8e91515b177cb356b79cd2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=388e7a76558aeeed8e91515b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 20:21:07 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SET_SO_RCVBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88d8e9bf134..4982b08934b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3559,6 +3559,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_OOBINLINE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_OOBINLINE, optval, optlen ); + case WS_SO_RCVBUF: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_RCVBUF, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3575,14 +3578,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; - case WS_SO_RCVBUF: - if (*(const int*)optval < 2048) - { - WARN("SO_RCVBF for %d bytes is too small: ignored\n", *(const int*)optval ); - return 0; - } - /* Fall through */ - /* The options listed here don't need any special handling. Thanks to * the conversion happening above, options from there will fall through * to this, too.*/

1 0