wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Nikolay Sivov : version: Use same Windows 10 build number for version information.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: c89ce41ec964c4f704bb12c8a8c6ab386372bae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c89ce41ec964c4f704bb12c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 25 20:02:25 2022 +0300 version: Use same Windows 10 build number for version information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 8 ++++---- dlls/ntdll/version.c | 26 +++++++++++++------------- programs/winecfg/appdefaults.c | 32 ++++++++++++++++---------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 7ca3ecdc712..ff37b26c674 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -130,13 +130,13 @@ typedef struct * Win8 info, reported if the app doesn't provide compat GUID in the manifest and * doesn't have higher OS version in PE header. */ -static const struct version_info windows8_version_info = { 6, 2, 0x23f0 }; +static const struct version_info windows8_version_info = { 6, 2, 9200 }; /*********************************************************************** * Win8.1 info, reported if the app doesn't provide compat GUID in the manifest and * OS version in PE header is 8.1 or higher but below 10. */ -static const struct version_info windows8_1_version_info = { 6, 3, 0x2580 }; +static const struct version_info windows8_1_version_info = { 6, 3, 9600 }; /*********************************************************************** @@ -151,12 +151,12 @@ static const struct { /* Windows 8.1 */ { - { 6, 3, 0x2580 }, + { 6, 3, 9600 }, {0x1f676c76,0x80e1,0x4239,{0x95,0xbb,0x83,0xd0,0xf6,0xd0,0xda,0x78}} }, /* Windows 10 */ { - { 10, 0, 0x42ee }, + { 10, 0, 18362 }, {0x8e0f7a12,0xbfb3,0x4fe8,{0xb9,0xa5,0x48,0xfd,0x50,0xa1,0x5a,0x9a}} } }; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 5f956d9d2e6..492c24cc636 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -105,69 +105,69 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* NT351 */ { - sizeof(RTL_OSVERSIONINFOEXW), 3, 51, 0x421, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 3, 51, 1057, VER_PLATFORM_WIN32_NT, L"Service Pack 5", 5, 0, 0, VER_NT_WORKSTATION, 0 }, /* NT40 */ { - sizeof(RTL_OSVERSIONINFOEXW), 4, 0, 0x565, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 4, 0, 1381, VER_PLATFORM_WIN32_NT, L"Service Pack 6a", 6, 0, 0, VER_NT_WORKSTATION, 0 }, /* NT2K */ { - sizeof(RTL_OSVERSIONINFOEXW), 5, 0, 0x893, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 5, 0, 2195, VER_PLATFORM_WIN32_NT, L"Service Pack 4", 4, 0, 0, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, /* WINXP */ { - sizeof(RTL_OSVERSIONINFOEXW), 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 5, 1, 2600, VER_PLATFORM_WIN32_NT, L"Service Pack 3", 3, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, /* WINXP64 */ { - sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K3 */ { - sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WINVISTA */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1772, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K8 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1772, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WIN7 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K8R2 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WIN8 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN81 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x4563, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index df187ca41e1..c20570a40e5 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -50,24 +50,24 @@ struct win_version static const struct win_version win_versions[] = { - { L"win10", L"Windows 10", 10, 0, 0x4563,VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win81", L"Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win8", L"Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win2008r2", L"Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"ServerNT"}, - { L"win7", L"Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"WinNT"}, - { L"win2008", L"Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, - { L"vista", L"Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, - { L"win2003", L"Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, + { L"win10", L"Windows 10", 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win81", L"Windows 8.1", 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win8", L"Windows 8", 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win2008r2", L"Windows 2008 R2", 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"ServerNT"}, + { L"win7", L"Windows 7", 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"WinNT"}, + { L"win2008", L"Windows 2008", 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, + { L"vista", L"Windows Vista", 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, + { L"win2003", L"Windows 2003", 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, #ifdef _WIN64 - { L"winxp64", L"Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, + { L"winxp64", L"Windows XP", 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, #else - { L"winxp", L"Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, L"Service Pack 3", 3, 0, L"WinNT"}, - { L"win2k", L"Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, L"Service Pack 4", 4, 0, L"WinNT"}, - { L"winme", L"Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, L" ", 0, 0, L""}, - { L"win98", L"Windows 98", 4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, L" A ", 0, 0, L""}, - { L"win95", L"Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, L"", 0, 0, L""}, - { L"nt40", L"Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, L"Service Pack 6a", 6, 0, L"WinNT"}, - { L"nt351", L"Windows NT 3.51", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, L"Service Pack 5", 5, 0, L"WinNT"}, + { L"winxp", L"Windows XP", 5, 1, 2600, VER_PLATFORM_WIN32_NT, L"Service Pack 3", 3, 0, L"WinNT"}, + { L"win2k", L"Windows 2000", 5, 0, 2195, VER_PLATFORM_WIN32_NT, L"Service Pack 4", 4, 0, L"WinNT"}, + { L"winme", L"Windows ME", 4, 90, 3000, VER_PLATFORM_WIN32_WINDOWS, L" ", 0, 0, L""}, + { L"win98", L"Windows 98", 4, 10, 2222, VER_PLATFORM_WIN32_WINDOWS, L" A ", 0, 0, L""}, + { L"win95", L"Windows 95", 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, L"", 0, 0, L""}, + { L"nt40", L"Windows NT 4.0", 4, 0, 1381, VER_PLATFORM_WIN32_NT, L"Service Pack 6a", 6, 0, L"WinNT"}, + { L"nt351", L"Windows NT 3.51", 3, 51, 1057, VER_PLATFORM_WIN32_NT, L"Service Pack 5", 5, 0, L"WinNT"}, { L"win31", L"Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, { L"win30", L"Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, { L"win20", L"Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}

1 0

Bernhard Kölbl : widl: Add support for the [overload] attribute.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 64d5feb4ce86a45941edecc5369546169a6f0549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d5feb4ce86a45941edecc5… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jan 25 17:07:28 2022 +0100 widl: Add support for the [overload] attribute. The attribute is used by WinRT and doesn't have any effect on the generated headers. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 2 ++ 4 files changed, 7 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 823d6f0acca..9286a494d4d 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -403,6 +403,7 @@ static const struct keyword attr_keywords[] = {"optimize", tOPTIMIZE, 0}, {"optional", tOPTIONAL, 0}, {"out", tOUT, 0}, + {"overload", tOVERLOAD, 0}, {"partial_ignore", tPARTIALIGNORE, 0}, {"pointer_default", tPOINTERDEFAULT, 0}, {"progid", tPROGID, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 82cf946e8fb..d6ac73cbf00 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -231,6 +231,7 @@ static typelib_t *current_typelib; %token tOBJECT tODL tOLEAUTOMATION %token tOPTIMIZE tOPTIONAL %token tOUT +%token tOVERLOAD %token tPARTIALIGNORE tPASCAL %token tPOINTERDEFAULT %token tPRAGMA_WARNING @@ -669,6 +670,7 @@ attribute: { $$ = NULL; } | tOPTIMIZE '(' aSTRING ')' { $$ = make_attrp(ATTR_OPTIMIZE, $3); } | tOPTIONAL { $$ = make_attr(ATTR_OPTIONAL); } | tOUT { $$ = make_attr(ATTR_OUT); } + | tOVERLOAD '(' aSTRING ')' { $$ = make_attrp(ATTR_OVERLOAD, $3); } | tPARTIALIGNORE { $$ = make_attr(ATTR_PARTIALIGNORE); } | tPOINTERDEFAULT '(' pointer_type ')' { $$ = make_attrv(ATTR_POINTERDEFAULT, $3); } | tPROGID '(' aSTRING ')' { $$ = make_attrp(ATTR_PROGID, $3); } @@ -2385,6 +2387,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_OPTIMIZE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optimize" }, /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, /* ATTR_OUT */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_OVERLOAD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "overload" }, /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, /* ATTR_POINTERDEFAULT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 8df927fea4c..e345730731a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -146,6 +146,7 @@ enum attr_type ATTR_OPTIMIZE, ATTR_OPTIONAL, ATTR_OUT, + ATTR_OVERLOAD, ATTR_PARAMLCID, ATTR_PARTIALIGNORE, ATTR_POINTERDEFAULT, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 610f781ba76..abeb37f34a4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1419,6 +1419,8 @@ static int add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) break; case ATTR_OUT: break; + case ATTR_OVERLOAD: + break; case ATTR_PROPGET: invokekind = 0x2; /* INVOKE_PROPERTYGET */ break;

1 0

Damjan Jovanovic : ntdll: Use the correct amd64 trap codes on *BSD.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 7a6ef5c2df16bf222ee3a5298bfd3b5b47c1d8b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a6ef5c2df16bf222ee3a529… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 25 17:37:12 2022 +0200 ntdll: Use the correct amd64 trap codes on *BSD. Fix the *BSD trap codes on amd64 like 148120f21ecf7ad30aaa2136f8d9f00f2f241231 did on i386. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68e0c7ce66e..68855dccacf 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -144,6 +144,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#include <machine/trap.h> + #define RAX_sig(context) ((context)->uc_mcontext.mc_rax) #define RBX_sig(context) ((context)->uc_mcontext.mc_rbx) #define RCX_sig(context) ((context)->uc_mcontext.mc_rcx) @@ -238,6 +240,27 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, enum i386_trap_code { +#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + TRAP_x86_DIVIDE = T_DIVIDE, /* Division by zero exception */ + TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */ + TRAP_x86_NMI = T_NMI, /* NMI interrupt */ + TRAP_x86_BPTFLT = T_BPTFLT, /* Breakpoint exception */ + TRAP_x86_OFLOW = T_OFLOW, /* Overflow exception */ + TRAP_x86_BOUND = T_BOUND, /* Bound range exception */ + TRAP_x86_PRIVINFLT = T_PRIVINFLT, /* Invalid opcode exception */ + TRAP_x86_DNA = T_DNA, /* Device not available exception */ + TRAP_x86_DOUBLEFLT = T_DOUBLEFLT, /* Double fault exception */ + TRAP_x86_FPOPFLT = T_FPOPFLT, /* Coprocessor segment overrun */ + TRAP_x86_TSSFLT = T_TSSFLT, /* Invalid TSS exception */ + TRAP_x86_SEGNPFLT = T_SEGNPFLT, /* Segment not present exception */ + TRAP_x86_STKFLT = T_STKFLT, /* Stack fault */ + TRAP_x86_PROTFLT = T_PROTFLT, /* General protection fault */ + TRAP_x86_PAGEFLT = T_PAGEFLT, /* Page fault */ + TRAP_x86_ARITHTRAP = T_ARITHTRAP, /* Floating point exception */ + TRAP_x86_ALIGNFLT = T_ALIGNFLT, /* Alignment check exception */ + TRAP_x86_MCHK = T_MCHK, /* Machine check exception */ + TRAP_x86_CACHEFLT = T_XMMFLT /* Cache flush exception */ +#else TRAP_x86_DIVIDE = 0, /* Division by zero exception */ TRAP_x86_TRCTRAP = 1, /* Single-step exception */ TRAP_x86_NMI = 2, /* NMI interrupt */ @@ -257,6 +280,7 @@ enum i386_trap_code TRAP_x86_ALIGNFLT = 17, /* Alignment check exception */ TRAP_x86_MCHK = 18, /* Machine check exception */ TRAP_x86_CACHEFLT = 19 /* Cache flush exception */ +#endif }; /* stack layout when calling an exception raise function */

1 0

Georg Lehmann : winevulkan: Support Vulkan 1.3.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 3b8d7f7f036f3f4771284df97cce99d114fe42cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8d7f7f036f3f4771284df9… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 25 13:37:07 2022 +0100 winevulkan: Support Vulkan 1.3. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 74 +++---- dlls/winevulkan/loader_thunks.c | 365 ++++++++++++++++++++++++++++++ dlls/winevulkan/loader_thunks.h | 291 ++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 480 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 76 ++++++- dlls/winevulkan/winevulkan.spec | 74 +++---- include/wine/vulkan.h | 74 +++++++ 8 files changed, 1360 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b8d7f7f036f3f477128…

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.204.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: fe5e06185dfc828b5d3873fd1b28f29f15d7c627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5e06185dfc828b5d3873fd… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 25 13:37:06 2022 +0100 winevulkan: Update to VK spec version 1.3.204. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 39 +- dlls/winevulkan/loader_thunks.c | 46 +- dlls/winevulkan/loader_thunks.h | 48 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 337 ++++++----- dlls/winevulkan/vulkan_thunks.h | 217 +++---- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 39 +- include/wine/vulkan.h | 1261 +++++++++++++++++++++++++-------------- include/wine/vulkan_driver.h | 2 +- 10 files changed, 1241 insertions(+), 752 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe5e06185dfc828b5d38…

1 0

Paul Gofman : winhttp: Set socket close state in WinHttpWebSocketClose().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 0417d9d0151b1801c122d8143787145a44207653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0417d9d0151b1801c122d814… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:08:04 2022 +0300 winhttp: Set socket close state in WinHttpWebSocketClose(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/notification.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cb2db948278..f37c33b202c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3784,7 +3784,6 @@ static DWORD socket_close( struct socket *socket ) if ((ret = socket_drain( socket ))) return ret; } - socket->state = SOCKET_STATE_CLOSED; return receive_close_status( socket, count ); } @@ -3834,6 +3833,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (socket->state < SOCKET_STATE_SHUTDOWN && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; + socket->state = SOCKET_STATE_CLOSED; if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_shutdown *s; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 88c6918cd98..2707151e00f 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -955,18 +955,18 @@ static void test_websocket(BOOL secure) close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); - ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + todo_wine ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + todo_wine ok( close_status == 0xdead, "got %u\n", close_status ); + todo_wine ok( size == sizeof(buffer) + 1, "got %u\n", size ); WaitForSingleObject( info.wait, INFINITE ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - todo_wine ok( err == ERROR_SUCCESS, "got %u\n", err ); - todo_wine ok( close_status == 1000, "got %u\n", close_status ); - todo_wine ok( size <= sizeof(buffer), "got %u\n", size ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( close_status == 1000, "got %u\n", close_status ); + ok( size <= sizeof(buffer), "got %u\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ );

1 0

Paul Gofman : winhttp/tests: Test closing websocket when receive is pending.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 57b26a83bac3e6afeaa2fb45281fe6a20ef75af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b26a83bac3e6afeaa2fb45… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:08:03 2022 +0300 winhttp/tests: Test closing websocket when receive is pending. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 101 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 4127f9933bb..88c6918cd98 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -676,6 +676,29 @@ static const struct notification websocket_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, +}; + +static const struct notification websocket_test2[] = +{ + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, NF_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, NF_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, NF_SIGNAL }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, + { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, + { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR }, + { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } @@ -869,6 +892,84 @@ static void test_websocket(BOOL secure) ok( size <= sizeof(buffer), "got %u\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( socket ); + WinHttpCloseHandle( request ); + + WaitForSingleObject( info.wait, INFINITE ); + end_test( &info, __LINE__ ); + + /* Test socket close while receive is pending. */ + info.test = websocket_test2; + info.count = ARRAY_SIZE( websocket_test2 ); + info.index = 0; + + setup_test( &info, winhttp_open_request, __LINE__ ); + request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); + ok( request != NULL, "got %u\n", err ); + + if (secure) + { + flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + } + + ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); + ok( ret, "got %u\n", GetLastError() ); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "got %u\n", GetLastError() ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + ret = WinHttpReceiveResponse( request, NULL ); + ok( ret, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + size = sizeof(status); + ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed unexpectedly %u\n", err ); + ok( status == 101, "got %u\n", status ); + + setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); + socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); + ok( socket != NULL, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_websocket_receive, __LINE__ ); + buffer[0] = 0; + err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + ok( buffer[0] == 'R', "unexpected data\n" ); + + err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + + setup_test( &info, winhttp_websocket_close, __LINE__ ); + ret = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + + close_status = 0xdead; + size = sizeof(buffer) + 1; + err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( close_status == 0xdead, "got %u\n", close_status ); + ok( size == sizeof(buffer) + 1, "got %u\n", size ); + + WaitForSingleObject( info.wait, INFINITE ); + + close_status = 0xdead; + size = sizeof(buffer) + 1; + err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); + todo_wine ok( err == ERROR_SUCCESS, "got %u\n", err ); + todo_wine ok( close_status == 1000, "got %u\n", close_status ); + todo_wine ok( size <= sizeof(buffer), "got %u\n", size ); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( socket ); WinHttpCloseHandle( request ); WinHttpCloseHandle( connection );

1 0

Paul Gofman : winhttp: Process server close frame in handle_control_frame().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: de9a7e65408f30719417a3e1f383df1f48987019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9a7e65408f30719417a3e1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:08:02 2022 +0300 winhttp: Process server close frame in handle_control_frame(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 27 +++++++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 890a5a645e7..cb2db948278 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3509,20 +3509,24 @@ static DWORD receive_close_status( struct socket *socket, unsigned int len ) { DWORD reason_len, ret; + socket->close_frame_received = TRUE; if ((len && (len < sizeof(socket->status) || len > sizeof(socket->status) + sizeof(socket->reason)))) - return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + return (socket->close_frame_receive_err = ERROR_WINHTTP_INVALID_SERVER_RESPONSE); - if (!len) return ERROR_SUCCESS; + if (!len) return (socket->close_frame_receive_err = ERROR_SUCCESS); reason_len = len - sizeof(socket->status); if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &len, TRUE ))) - return ret; + return (socket->close_frame_receive_err = ret); socket->status = RtlUshortByteSwap( socket->status ); - return receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ); + return (socket->close_frame_receive_err + = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE )); } static DWORD handle_control_frame( struct socket *socket ) { + TRACE( "opcode %u.\n", socket->opcode ); + switch (socket->opcode) { case SOCKET_OPCODE_PING: @@ -3531,6 +3535,19 @@ static DWORD handle_control_frame( struct socket *socket ) case SOCKET_OPCODE_PONG: return socket_drain( socket ); + case SOCKET_OPCODE_CLOSE: + if (socket->state != SOCKET_STATE_CLOSED) + WARN( "SOCKET_OPCODE_CLOSE received, socket->state %u.\n", socket->state ); + if (socket->close_frame_received) + { + FIXME( "Close frame already received.\n" ); + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } + + receive_close_status( socket, socket->read_size ); + socket->read_size = 0; + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + default: ERR("unhandled control opcode %02x\n", socket->opcode); return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; @@ -3754,6 +3771,8 @@ static DWORD socket_close( struct socket *socket ) { DWORD ret, count; + if (socket->close_frame_received) return socket->close_frame_receive_err; + if ((ret = socket_drain( socket ))) return ret; while (1) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ef52944e412..5eb3e97a916 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -246,6 +246,8 @@ struct socket struct queue recv_q; enum socket_opcode opcode; DWORD read_size; + BOOL close_frame_received; + DWORD close_frame_receive_err; USHORT status; char reason[123]; DWORD reason_len;

1 0

Paul Gofman : winhttp: Factor out receive_close_status() function.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: d5fb34ebdbdd956e1ae3206cf92a793b88622c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fb34ebdbdd956e1ae3206c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:08:01 2022 +0300 winhttp: Factor out receive_close_status() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b31ba2480bb..890a5a645e7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3505,6 +3505,22 @@ static DWORD socket_drain( struct socket *socket ) return ERROR_SUCCESS; } +static DWORD receive_close_status( struct socket *socket, unsigned int len ) +{ + DWORD reason_len, ret; + + if ((len && (len < sizeof(socket->status) || len > sizeof(socket->status) + sizeof(socket->reason)))) + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + + if (!len) return ERROR_SUCCESS; + + reason_len = len - sizeof(socket->status); + if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &len, TRUE ))) + return ret; + socket->status = RtlUshortByteSwap( socket->status ); + return receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ); +} + static DWORD handle_control_frame( struct socket *socket ) { switch (socket->opcode) @@ -3749,19 +3765,8 @@ static DWORD socket_close( struct socket *socket ) if ((ret = socket_drain( socket ))) return ret; } - if ((count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) - return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; - - if (count) - { - DWORD reason_len = count - sizeof(socket->status); - if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) return ret; - socket->status = RtlUshortByteSwap( socket->status ); - if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) return ret; - } socket->state = SOCKET_STATE_CLOSED; - - return ERROR_SUCCESS; + return receive_close_status( socket, count ); } static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )

1 0

Paul Gofman : winhttp: Move close callback call to task_socket_close().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 07639a02d398c24cded91cad42103525cc7146b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07639a02d398c24cded91cad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:08:00 2022 +0300 winhttp: Move close callback call to task_socket_close(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 893afdbfb52..b31ba2480bb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3734,57 +3734,52 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r return ret; } -static DWORD socket_close( struct socket *socket, BOOL async ) +static DWORD socket_close( struct socket *socket ) { DWORD ret, count; - if ((ret = socket_drain( socket ))) goto done; + if ((ret = socket_drain( socket ))) return ret; while (1) { - if ((ret = receive_frame( socket, &count, &socket->opcode ))) goto done; + if ((ret = receive_frame( socket, &count, &socket->opcode ))) return ret; if (socket->opcode == SOCKET_OPCODE_CLOSE) break; socket->read_size = count; - if ((ret = socket_drain( socket ))) goto done; + if ((ret = socket_drain( socket ))) return ret; } if ((count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) - { - ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; - goto done; - } + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; if (count) { DWORD reason_len = count - sizeof(socket->status); - if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) goto done; + if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) return ret; socket->status = RtlUshortByteSwap( socket->status ); - if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) goto done; + if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) return ret; } socket->state = SOCKET_STATE_CLOSED; -done: - if (async) - { - if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 ); - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */ - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } - return ret; + return ERROR_SUCCESS; } static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { struct socket_shutdown *s = ctx; + DWORD ret; + + ret = socket_close( s->socket ); - socket_close( s->socket, TRUE ); + if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */ + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION; + send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } TRACE("running %p\n", work); release_object( &s->socket->hdr ); @@ -3829,7 +3824,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas free( s ); } } - else ret = socket_close( socket, FALSE ); + else ret = socket_close( socket ); done: release_object( &socket->hdr );

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022