- Wine-Devel - list.winehq.org

[PATCH] include: Add mulres.idl
by Alistair Leslie-Hughes Jan. 15, 2021

Jan. 15, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++ include/Makefile.in | 1 + include/mulres.idl | 47 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 63 insertions(+) create mode 100644 include/mulres.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 917395b37bd..75ba1ef40dc 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1630,6 +1630,20 @@ HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, return E_NOTIMPL; } +HRESULT __RPC_STUB IMultipleResults_GetResult_Stub(IMultipleResults* This, IUnknown *outer, + DBRESULTFLAG result, REFIID riid, DBROWCOUNT *affected, IUnknown **rowset, IErrorInfo **error) +{ + FIXME("(%p)->(%p %d %s %p %p %p): stub\n", This, outer, result, debugstr_guid(riid), affected, rowset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IMultipleResults_GetResult_Proxy(IMultipleResults* This, IUnknown *outer, + DBRESULTFLAG result, REFIID riid, DBROWCOUNT *affected, IUnknown **rowset) +{ + FIXME("(%p)->(%p %d %s %p %p): stub\n", This, outer, result, debugstr_guid(riid), affected, rowset); + return E_NOTIMPL; +} + HRESULT CALLBACK ICommandPrepare_Prepare_Proxy(ICommandPrepare* This, ULONG runs) { FIXME("(%p)->(%d): stub\n", This, runs); diff --git a/include/Makefile.in b/include/Makefile.in index 74a1d8e0c89..0387068067e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -520,6 +520,7 @@ SOURCES = \ netioapi.h \ netlistmgr.idl \ newdev.h \ + mulres.idl \ nldef.h \ npapi.h \ nserror.h \ diff --git a/include/mulres.idl b/include/mulres.idl new file mode 100644 index 00000000000..d7bda98b9bf --- /dev/null +++ b/include/mulres.idl @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a90-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IMultipleResults : IUnknown +{ + typedef DB_LRESERVE DBRESULTFLAG; + + enum DBRESULTFLAGENUM + { + DBRESULTFLAG_DEFAULT = 0, + DBRESULTFLAG_ROWSET = 1, + DBRESULTFLAG_ROW = 2, + }; + + [local] + HRESULT GetResult([in] IUnknown *outer, [in] DBRESULTFLAG result, [in] REFIID riid, [out] DBROWCOUNT *affected, + [out, iid_is(riid), annotation("_Outptr_opt_result_maybenull_")] IUnknown ** rowset); + + [call_as(GetResult)] + HRESULT RemoteGetResult([in] IUnknown *outer, [in] DBRESULTFLAG result, [in] REFIID riid, + [in, out, unique] DBROWCOUNT *affected, [in, out, unique, iid_is(riid)] IUnknown **rowset, + [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4e333353a5e..475eb85642e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -77,6 +77,7 @@ typedef LONG_PTR DB_LRESERVE; #include "cmdpre.idl" #include "rstchg.idl" #include "rstupd.idl" +#include "mulres.idl" cpp_quote("#include <accctrl.h>") -- 2.29.2

1 0

[PATCH] ntdll/tests: Clean up temp file.
by Daniel Lehman Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- DeleteFile errors with sharing violation leaving files in %TEMP% --- dlls/ntdll/tests/om.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c92b780541f..701980e1a5f 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1435,9 +1435,8 @@ static void test_query_object(void) GetTempPathA(MAX_PATH, tmp_path); GetTempFileNameA(tmp_path, "foo", 0, file1); - handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); test_object_type(handle, L"File"); - DeleteFileA( file1 ); test_file_info( handle ); pNtClose( handle ); -- 2.25.1

1 0

[PATCH 1/5] windowscodecs: Move stream wrappers to stream.c.
by Rémi Bernon Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Although JPEG-XR is already upstream (supposedly) in 6.0, this is a bit of refactoring to make windowscodecs.dll decoder.c, and its unix lib interfaces usable directly from wmphoto.dll, in order to later integrate jxrlib for decoding JPEG-XR images. We could also duplicate the code, but that doesn't feel very nice. dlls/windowscodecs/main.c | 37 ------------------------------------- dlls/windowscodecs/stream.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index e78acc3f34f..efc6bc2c227 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -190,43 +190,6 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, return hr; } -HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size) -{ - STATSTG statstg; - HRESULT hr; - - hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); - - if (SUCCEEDED(hr)) - *size = statstg.cbSize.QuadPart; - - return hr; -} - -HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) -{ - return IStream_Read(stream, buffer, read, bytes_read); -} - -HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) -{ - HRESULT hr; - LARGE_INTEGER ofs_large; - ULARGE_INTEGER pos_large; - - ofs_large.QuadPart = ofs; - hr = IStream_Seek(stream, ofs_large, origin, &pos_large); - if (new_position) - *new_position = pos_large.QuadPart; - - return hr; -} - -HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written) -{ - return IStream_Write(stream, buffer, write, bytes_written); -} - HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) { HRESULT hr; diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 68b9148bd5e..8c36825b641 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -1167,3 +1167,40 @@ HRESULT StreamImpl_Create(IWICStream **stream) return S_OK; } + +HRESULT CDECL stream_getsize(IStream *stream, ULONGLONG *size) +{ + STATSTG statstg; + HRESULT hr; + + hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) + *size = statstg.cbSize.QuadPart; + + return hr; +} + +HRESULT CDECL stream_read(IStream *stream, void *buffer, ULONG read, ULONG *bytes_read) +{ + return IStream_Read(stream, buffer, read, bytes_read); +} + +HRESULT CDECL stream_seek(IStream *stream, LONGLONG ofs, DWORD origin, ULONGLONG *new_position) +{ + HRESULT hr; + LARGE_INTEGER ofs_large; + ULARGE_INTEGER pos_large; + + ofs_large.QuadPart = ofs; + hr = IStream_Seek(stream, ofs_large, origin, &pos_large); + if (new_position) + *new_position = pos_large.QuadPart; + + return hr; +} + +HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULONG *bytes_written) +{ + return IStream_Write(stream, buffer, write, bytes_written); +} -- 2.30.0

2 6

[PATCH resend 1/3] kernel32: Print processor group in Get(Active|Maximum)ProcessorCount
by Alex Henrie Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b8a0c823398..c1c3c484493 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -611,7 +611,7 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } @@ -622,7 +622,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } -- 2.30.0

1 2

[PATCH resend] ws2_32: Read protocol table from a file
by Alex Henrie Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I intend to extend read_protocol_table and parse_next_protocol to read and parse the services file as well, since the file formats are nearly identical. --- dlls/ws2_32/protocols.tsv | 39 +++++++++ dlls/ws2_32/socket.c | 163 ++++++++++++++++++++++++++++++-------- dlls/ws2_32/version.rc | 3 + loader/wine.inf.in | 12 ++- 4 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 dlls/ws2_32/protocols.tsv diff --git a/dlls/ws2_32/protocols.tsv b/dlls/ws2_32/protocols.tsv new file mode 100644 index 00000000000..288bd739f15 --- /dev/null +++ b/dlls/ws2_32/protocols.tsv @@ -0,0 +1,39 @@ +# Table of Internet protocols +# +# Copyright (c) 2020 The Wine Project +# +# 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 + +# Format: <name> <number> [<alias>...] + +ip 0 IP +icmp 1 ICMP +ggp 3 GGP +tcp 6 TCP +egp 8 EGP +pup 12 PUP +udp 17 UDP +hmp 20 HMP +xns-idp 22 XNS-IDP +rdp 27 RDP +ipv6 41 IPv6 +ipv6-route 43 IPv6-Route +ipv6-frag 44 IPv6-Frag +esp 50 ESP +ah 51 AH +ipv6-icmp 58 IPv6-ICMP +ipv6-nonxt 59 IPv6-NoNxt +ipv6-opts 60 IPv6-Opts +rvd 66 RVD diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0579ede8772..2d271e825bc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -182,6 +182,8 @@ #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) +#define MAX_NAMES 4 + WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -6311,28 +6313,112 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) } -static const struct { int prot; const char *names[3]; } protocols[] = -{ - { 0, { "ip", "IP" }}, - { 1, { "icmp", "ICMP" }}, - { 3, { "ggp", "GGP" }}, - { 6, { "tcp", "TCP" }}, - { 8, { "egp", "EGP" }}, - { 12, { "pup", "PUP" }}, - { 17, { "udp", "UDP" }}, - { 20, { "hmp", "HMP" }}, - { 22, { "xns-idp", "XNS-IDP" }}, - { 27, { "rdp", "RDP" }}, - { 41, { "ipv6", "IPv6" }}, - { 43, { "ipv6-route", "IPv6-Route" }}, - { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, - { 58, { "ipv6-icmp", "IPv6-ICMP" }}, - { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, - { 60, { "ipv6-opts", "IPv6-Opts" }}, - { 66, { "rvd", "RVD" }}, -}; +static char * read_protocol_table(void) +{ + static const WCHAR drivers_etc_protocol[] = {'\\','d','r','i','v','e','r','s', + '\\','e','t','c', + '\\','p','r','o','t','o','c','o','l',0}; + WCHAR table_path[MAX_PATH]; + HANDLE table_file; + DWORD table_len, bytes_read; + BOOL ret; + char *table_text; + + GetSystemDirectoryW(table_path, ARRAY_SIZE(table_path)); + lstrcatW(table_path, drivers_etc_protocol); + + table_file = CreateFileW(table_path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (table_file == INVALID_HANDLE_VALUE) + return NULL; + + table_len = GetFileSize(table_file, NULL); + if (!table_len) + { + CloseHandle(table_file); + return NULL; + } + + table_text = HeapAlloc(GetProcessHeap(), 0, table_len + 1); + if (!table_text) + { + CloseHandle(table_file); + return NULL; + } + + ret = ReadFile(table_file, table_text, table_len, &bytes_read, NULL); + if (!ret || bytes_read != table_len) + { + CloseHandle(table_file); + HeapFree(GetProcessHeap(), 0, table_text); + return NULL; + } + + CloseHandle(table_file); + table_text[table_len] = 0; + return table_text; +} + +static char * get_field(char *line) +{ + char *field; + /* ignore sequences of whitespace between fields */ + while ((field = strtok(line, " \t\r"))) + { + if (field[0]) + break; + } + return field; +} + +static char * parse_next_protocol(char *current_line, int *number, char *names[MAX_NAMES]) +{ + char *next_line; + char *comment; + int i; + + while (current_line) + { + next_line = strchr(current_line, '\n'); + if (next_line) + { + next_line[0] = 0; + next_line++; + } + + comment = strchr(current_line, '#'); + if (comment) + *comment = 0; + + names[0] = get_field(current_line); + if (!names[0]) + { + /* this line is empty, all whitespace, or a comment */ + current_line = next_line; + continue; + } + + names[1] = get_field(NULL); + if (!names[1]) + { + /* lines that only have one field are ignored too */ + current_line = next_line; + continue; + } + /* if the second field is not actually a number, it is treated as 0 */ + *number = atoi(names[1]); + + for (i = 1;; i++) + { + names[i] = (i == MAX_NAMES - 1 ? NULL : get_field(NULL)); + if (!names[i]) break; + } + + return next_line; + } + + return NULL; +} /*********************************************************************** * getprotobyname (WS2_32.53) @@ -6340,21 +6426,31 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; + char *table_text = read_protocol_table(); + char *current_line = table_text; + int row_number; + char *row_names[MAX_NAMES]; unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + while ((current_line = parse_next_protocol( current_line, &row_number, row_names ))) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; + for (i = 0; row_names[i]; i++) + { + if (!_strnicmp( row_names[i], name, -1 )) + { + retval = WS_create_pe( row_names[0], (char **)row_names + 1, row_number ); + goto found; + } + } } if (!retval) { WARN( "protocol %s not found\n", debugstr_a(name) ); SetLastError(WSANO_DATA); } +found: TRACE( "%s ret %p\n", debugstr_a(name), retval ); + if (table_text) HeapFree( GetProcessHeap(), 0, table_text ); return retval; } @@ -6365,13 +6461,15 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; - unsigned int i; + char *table_text = read_protocol_table(); + char *current_line = table_text; + int row_number; + char *row_names[MAX_NAMES]; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + while ((current_line = parse_next_protocol( current_line, &row_number, row_names ))) { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); + if (row_number != number) continue; + retval = WS_create_pe( row_names[0], (char **)row_names + 1, row_number ); break; } if (!retval) @@ -6380,6 +6478,7 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) SetLastError(WSANO_DATA); } TRACE("%i ret %p\n", number, retval); + if (table_text) HeapFree( GetProcessHeap(), 0, table_text ); return retval; } diff --git a/dlls/ws2_32/version.rc b/dlls/ws2_32/version.rc index 52dbb1b2c48..a68f9885805 100644 --- a/dlls/ws2_32/version.rc +++ b/dlls/ws2_32/version.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: protocols.tsv */ +1 WINE_DATA_FILE protocols.tsv + #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "ws2_32.dll" #define WINE_FILEVERSION 5,1,2600,5512 diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1df9c21203e..4f730865555 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -4080,6 +4080,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [ColorFiles] srgb color space profile.icm,"@mscms.dll,-1" +[EtcFiles] +protocol,"@ws2_32.dll,-1" + [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" @@ -4168,6 +4171,7 @@ SortFiles = nls [DestinationDirs] ColorFiles = 23 +EtcFiles = 12,etc InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting -- 2.30.0

1 0

[PATCH] ws2_32: Hook up IPV6_HOPLIMIT
by Alex Henrie Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- FelgoLiveClient.exe from https://felgo.com/ sets this option. --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 04eb447d3bb..556fd835488 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -534,6 +534,7 @@ static inline const char *debugstr_sockopt(int level, int optname) { DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_HOPLIMIT); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); @@ -866,6 +867,7 @@ static const int ws_ipv6_map[][2] = #ifdef IPV6_DROP_MEMBERSHIP MAP_OPTION( IPV6_DROP_MEMBERSHIP ), #endif + MAP_OPTION( IPV6_HOPLIMIT ), MAP_OPTION( IPV6_MULTICAST_IF ), MAP_OPTION( IPV6_MULTICAST_HOPS ), MAP_OPTION( IPV6_MULTICAST_LOOP ), @@ -4184,6 +4186,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif + case WS_IPV6_HOPLIMIT: case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -5887,6 +5890,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif + case WS_IPV6_HOPLIMIT: case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: -- 2.30.0

1 0

[PATCH resend 1/4] ntdll: Implement RtlInitializeGenericTable
by Alex Henrie Jan. 14, 2021

Jan. 14, 2021

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/rtl.c | 13 ++++++++++++- include/ddk/ntddk.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..6afe4d876dd 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -428,7 +428,18 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, void *context) { - FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); + TRACE("(%p, %p, %p, %p, %p)\n", table, compare, allocate, free, context); + + table->TableRoot = NULL; + table->InsertOrderList.Flink = &(table->InsertOrderList); + table->InsertOrderList.Blink = &(table->InsertOrderList); + table->OrderedPointer = &(table->InsertOrderList); + table->NumberGenericTableElements = 0; + table->WhichOrderedElement = 0; + table->CompareRoutine = compare; + table->AllocateRoutine = allocate; + table->FreeRoutine = free; + table->TableContext = context; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..3a1d68b1fa8 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.30.0

1 3

Wine staging 6.0 release
by Alistair Leslie-Hughes Jan. 14, 2021

Jan. 14, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0 (784 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] include: Move interlocked functions to winnt.h.
by Zebediah Figura Jan. 14, 2021

Jan. 14, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/winbase.h | 132 ---------------------------------------------- include/winnt.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index dc8aa081be4..0262e50d980 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2919,138 +2919,6 @@ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); -/* Interlocked functions */ - -#ifdef _MSC_VER - -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedDecrement) - -long _InterlockedCompareExchange(long volatile*,long,long); -long long _InterlockedCompareExchange64(long long volatile*,long long,long long); -long _InterlockedDecrement(long volatile*); -long _InterlockedExchange(long volatile*,long); -long _InterlockedExchangeAdd(long volatile*,long); -long _InterlockedIncrement(long volatile*); - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( (long volatile *)dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( (long volatile *)dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( (long volatile *)dest ); -} - -#ifndef __i386__ - -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedExchangePointer) - -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer - -void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *InterlockedExchangePointer(void *volatile*,void*); - -#else - -static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) -{ - return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); -} - -static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) -{ - return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); -} - -#endif - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#if defined(__i386__) || defined(__x86_64__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return __sync_fetch_and_add( dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, 1 ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, -1 ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - PVOID ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#elif defined(__i386__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -#endif /* __GNUC__ */ - #ifdef __WINESRC__ static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void) diff --git a/include/winnt.h b/include/winnt.h index 83fcc67c85d..7bbe0185139 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6892,6 +6892,138 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #endif +/* Interlocked functions */ + +#ifdef _MSC_VER + +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) + +long _InterlockedCompareExchange(long volatile*,long,long); +long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +long _InterlockedDecrement(long volatile*); +long _InterlockedExchange(long volatile*,long); +long _InterlockedExchangeAdd(long volatile*,long); +long _InterlockedIncrement(long volatile*); + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + return _InterlockedExchange( (long volatile *)dest, val ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return _InterlockedExchangeAdd( (long volatile *)dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return _InterlockedIncrement( (long volatile *)dest ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return _InterlockedDecrement( (long volatile *)dest ); +} + +#ifndef __i386__ + +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchangePointer) + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedExchangePointer _InterlockedExchangePointer + +void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *InterlockedExchangePointer(void *volatile*,void*); + +#else + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); +} + +#endif + +#elif defined(__GNUC__) + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + LONG ret; +#if defined(__i386__) || defined(__x86_64__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" + : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + void *ret; +#ifdef __x86_64__ + __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#elif defined(__i386__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +#endif /* __GNUC__ */ + #ifdef _WIN64 #if defined(_MSC_VER) -- 2.29.2

2 6

[PATCH 1/2] dcomp: Add DCompositionCreateDevice2().
by Nikolay Sivov Jan. 14, 2021

Jan. 14, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50357 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dcomp/Makefile.in | 1 + dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 dlls/dcomp/device.c diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 6d75a87980f..436b88993ab 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -3,6 +3,7 @@ MODULE = dcomp.dll EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + device.c \ main.c RC_SRCS = version.rc diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 03801ebba6f..10e9f49a412 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -13,7 +13,7 @@ @ stub CreateEffectDescription @ stub DCompositionAttachMouseDragToHwnd @ stub DCompositionAttachMouseWheelToHwnd -@ stub DCompositionCreateDevice2 +@ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 @ stub DCompositionCreateDevice @ stub DCompositionCreateSurfaceHandle diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c new file mode 100644 index 00000000000..efc6bacdb08 --- /dev/null +++ b/dlls/dcomp/device.c @@ -0,0 +1,32 @@ +/* + * Copyright 2020 Nikolay Sivov 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 "objidl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dcomp); + +HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +} -- 2.29.2

1 1