- Wine-devel - list.winehq.org

[PATCH 1/9] dwrite/tests: Add a test for unset axis for references created with IDWriteFactory3.
by Nikolay Sivov 25 Apr '22

25 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 38eb1aeeb7d..af88c716ad8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7982,9 +7982,10 @@ static void test_CreateFontFaceReference(void) IDWriteFontFace3 *fontface, *fontface1; DWRITE_FONT_AXIS_VALUE axis_values[16]; IDWriteFontCollection1 *collection; + UINT32 axis_count, index, count, i; + IDWriteFontFaceReference1 *ref2; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; - UINT32 index, count, i; IDWriteFont3 *font3; ULONG refcount; WCHAR *path; @@ -8091,6 +8092,13 @@ static void test_CreateFontFaceReference(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(file != file1, "got %p, previous file %p\n", file1, file); + if (SUCCEEDED(IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) + { + axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + ok(!axis_count, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + IDWriteFontFaceReference_Release(ref); IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); @@ -8112,8 +8120,6 @@ static void test_CreateFontFaceReference(void) for (j = 0; j < font_count; j++) { - IDWriteFontFaceReference1 *ref2; - hr = IDWriteFontFamily1_GetFont(family, j, &font3); ok(hr == S_OK, "Failed to get font, hr %#lx.\n", hr); @@ -8132,7 +8138,7 @@ static void test_CreateFontFaceReference(void) if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) { - UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); todo_wine ok(axis_count >= 4, "Unexpected axis value count.\n"); -- 2.35.1

1 8

[PATCH] winedbg: Accept "continue".
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winedbg/debug.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 280013799c9..23073dd4c65 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -182,7 +182,7 @@ STRING \"(\\[^\n]|[^\\"\n])*\" <INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; } <INITIAL,NOPROCESS>where|wher|whe { BEGIN(NOCMD); return tBACKTRACE; } -<INITIAL>cont|con|co|c { BEGIN(NOCMD); return tCONT; } +<INITIAL>continue|continu|contin|conti|cont|con|co|c { BEGIN(NOCMD); return tCONT; } <INITIAL>pass|pas|pa { BEGIN(NOCMD); return tPASS; } <INITIAL>condition|conditio|conditi|condit|condi|cond { BEGIN(NOCMD); return tCOND; } <INITIAL>step|ste|st|s { BEGIN(NOCMD); return tSTEP; } -- 2.23.0

1 0

[PATCH] wbemprox: Add Win32_PageFileUsage class.
by Louis Lenders 25 Apr '22

25 Apr '22

https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wbemprox/builtin.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 07a5873208f..69d74d756f8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -260,6 +260,10 @@ static const struct column col_operatingsystem[] = { L"TotalVisibleMemorySize", CIM_UINT64 }, { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; +static const struct column col_pagefileusage[] = +{ + { L"Name", CIM_STRING }, +}; static const struct column col_param[] = { { L"Class", CIM_STRING }, @@ -687,6 +691,10 @@ struct record_operatingsystem UINT64 totalvisiblememorysize; const WCHAR *version; }; +struct record_pagefileusage +{ + const WCHAR *name; +}; struct record_param { const WCHAR *class; @@ -911,6 +919,10 @@ static const struct record_associator data_associator[] = { L"Win32_DiskDriveToDiskPartition", L"Win32_DiskPartition", L"Win32_DiskDrive" }, { L"Win32_LogicalDiskToPartition", L"Win32_LogicalDisk", L"Win32_DiskPartition" }, }; +static const struct record_pagefileusage data_pagefileusage[] = +{ + { L"c:\\pagefile.sys", }, +}; static const struct record_param data_param[] = { { L"__SystemSecurity", L"GetSD", -1, L"ReturnValue", CIM_UINT32 }, @@ -4148,6 +4160,7 @@ static struct table cimv2_builtin_classes[] = { L"Win32_NetworkAdapter", C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, { L"Win32_NetworkAdapterConfiguration", C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, { L"Win32_OperatingSystem", C(col_operatingsystem), 0, 0, NULL, fill_operatingsystem }, + { L"Win32_PageFileUsage", C(col_pagefileusage), D(data_pagefileusage) }, { L"Win32_PhysicalMedia", C(col_physicalmedia), D(data_physicalmedia) }, { L"Win32_PhysicalMemory", C(col_physicalmemory), 0, 0, NULL, fill_physicalmemory }, { L"Win32_PnPEntity", C(col_pnpentity), 0, 0, NULL, fill_pnpentity }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0a8c97ad166..e0fe78b7fd1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1475,6 +1475,31 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_PageFileUsage( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PageFileUsage" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %#lx\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_PhysicalMemory( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); @@ -2226,6 +2251,7 @@ START_TEST(query) test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); + test_Win32_PageFileUsage( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services ); test_Win32_Printer( services ); -- 2.36.0

2 1

[PATCH v2 1/2] include: Use nested namespace declaration in windows.foundation.idl.
by Rémi Bernon 25 Apr '22

25 Apr '22

From: Biswapriyo Nath <nathbappai(a)gmail.com> And move generic instantiations forward. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use nested namespaces at the same time as reorganizing the file. include/windows.foundation.idl | 293 ++++++++++++++++----------------- 1 file changed, 145 insertions(+), 148 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index c5f4c04a334..08a6af4ea7b 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -27,153 +27,150 @@ import "windowscontracts.idl"; /* import "ivectorchangedeventargs.idl"; */ import "windows.foundation.collections.idl"; -namespace Windows { - namespace Foundation { - interface IAsyncAction; - } -} - -namespace Windows { - namespace Foundation { - typedef enum PropertyType PropertyType; - typedef struct Point Point; - typedef struct Size Size; - typedef struct Rect Rect; - typedef struct DateTime DateTime; - typedef struct TimeSpan TimeSpan; - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7) - ] - delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status); - - [contract(Windows.Foundation.FoundationContract, 1.0)] - enum PropertyType { - Empty = 0, - UInt8 = 1, - Int16 = 2, - UInt16 = 3, - Int32 = 4, - UInt32 = 5, - Int64 = 6, - UInt64 = 7, - Single = 8, - Double = 9, - Char16 = 10, - Boolean = 11, - String = 12, - Inspectable = 13, - DateTime = 14, - TimeSpan = 15, - Guid = 16, - Point = 17, - Size = 18, - Rect = 19, - OtherType = 20, - UInt8Array = 1025, - Int16Array = 1026, - UInt16Array = 1027, - Int32Array = 1028, - UInt32Array = 1029, - Int64Array = 1030, - UInt64Array = 1031, - SingleArray = 1032, - DoubleArray = 1033, - Char16Array = 1034, - BooleanArray = 1035, - StringArray = 1036, - InspectableArray = 1037, - DateTimeArray = 1038, - TimeSpanArray = 1039, - GuidArray = 1040, - PointArray = 1041, - SizeArray = 1042, - RectArray = 1043, - OtherTypeArray = 1044 - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct Point { - FLOAT X; - FLOAT Y; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct Size { - FLOAT Width; - FLOAT Height; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct Rect { - FLOAT X; - FLOAT Y; - FLOAT Width; - FLOAT Height; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct DateTime { - INT64 UniversalTime; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct TimeSpan { - INT64 Duration; - }; - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) - ] - interface IStringable : IInspectable - { - HRESULT ToString([out, retval] HSTRING *value); - } - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) - ] - interface IClosable : IInspectable - { - HRESULT Close(); - } - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(5a648006-843a-4da9-865b-9d26e5dfad7b) - ] - interface IAsyncAction : IInspectable - requires IAsyncInfo - { - [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler); - [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); - HRESULT GetResults(); - } - } -} - -namespace Windows { - namespace Foundation { - declare { - interface Windows.Foundation.Collections.IIterable<HSTRING>; - interface Windows.Foundation.Collections.IIterable<IInspectable *>; - interface Windows.Foundation.Collections.IIterator<HSTRING>; - interface Windows.Foundation.Collections.IIterator<IInspectable *>; - interface Windows.Foundation.Collections.IVectorView<HSTRING>; - interface Windows.Foundation.Collections.IVectorView<IInspectable *>; - interface Windows.Foundation.Collections.IVector<HSTRING>; - interface Windows.Foundation.Collections.IVector<IInspectable *>; - interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>; - interface Windows.Foundation.EventHandler<IInspectable *>; - interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>; - interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; - interface Windows.Foundation.IAsyncOperation<IInspectable *>; - interface Windows.Foundation.IAsyncOperation<boolean>; - interface Windows.Foundation.IReference<INT32>; - interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; - } +namespace Windows.Foundation { + typedef enum PropertyType PropertyType; + typedef struct Point Point; + typedef struct Size Size; + typedef struct Rect Rect; + typedef struct DateTime DateTime; + typedef struct TimeSpan TimeSpan; + interface IAsyncAction; + interface IClosable; + interface IStringable; + + declare { + interface Windows.Foundation.Collections.IIterable<HSTRING>; + interface Windows.Foundation.Collections.IIterable<IInspectable *>; + interface Windows.Foundation.Collections.IIterator<HSTRING>; + interface Windows.Foundation.Collections.IIterator<IInspectable *>; + interface Windows.Foundation.Collections.IVectorView<HSTRING>; + interface Windows.Foundation.Collections.IVectorView<IInspectable *>; + interface Windows.Foundation.Collections.IVector<HSTRING>; + interface Windows.Foundation.Collections.IVector<IInspectable *>; + interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING> *>; + interface Windows.Foundation.EventHandler<IInspectable *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; + interface Windows.Foundation.IAsyncOperation<IInspectable *>; + interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.IReference<INT32>; + interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7) + ] + delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status); + + [contract(Windows.Foundation.FoundationContract, 1.0)] + enum PropertyType + { + Empty = 0, + UInt8 = 1, + Int16 = 2, + UInt16 = 3, + Int32 = 4, + UInt32 = 5, + Int64 = 6, + UInt64 = 7, + Single = 8, + Double = 9, + Char16 = 10, + Boolean = 11, + String = 12, + Inspectable = 13, + DateTime = 14, + TimeSpan = 15, + Guid = 16, + Point = 17, + Size = 18, + Rect = 19, + OtherType = 20, + UInt8Array = 1025, + Int16Array = 1026, + UInt16Array = 1027, + Int32Array = 1028, + UInt32Array = 1029, + Int64Array = 1030, + UInt64Array = 1031, + SingleArray = 1032, + DoubleArray = 1033, + Char16Array = 1034, + BooleanArray = 1035, + StringArray = 1036, + InspectableArray = 1037, + DateTimeArray = 1038, + TimeSpanArray = 1039, + GuidArray = 1040, + PointArray = 1041, + SizeArray = 1042, + RectArray = 1043, + OtherTypeArray = 1044, + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct Point + { + FLOAT X; + FLOAT Y; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct Size + { + FLOAT Width; + FLOAT Height; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct Rect + { + FLOAT X; + FLOAT Y; + FLOAT Width; + FLOAT Height; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct DateTime + { + INT64 UniversalTime; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct TimeSpan + { + INT64 Duration; + }; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) + ] + interface IStringable : IInspectable + { + HRESULT ToString([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(5a648006-843a-4da9-865b-9d26e5dfad7b) + ] + interface IAsyncAction : IInspectable + requires IAsyncInfo + { + [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); + HRESULT GetResults(); } } -- 2.35.1

1 1

[PATCH v2 1/2] include: Add windows.ui.idl file.
by Mohamad Al-Jaf 25 Apr '22

25 Apr '22

Needed by windows.media.closedcaptioning.idl. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Use right aligned pointer. - Use value instead of returnValue. Wine doesn't seem to use return_value anywhere so this change makes it more consistent with the Wine code style. --- include/Makefile.in | 1 + include/windows.ui.idl | 323 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 324 insertions(+) create mode 100644 include/windows.ui.idl diff --git a/include/Makefile.in b/include/Makefile.in index b0a1d0e4880..837c6077fd9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -800,6 +800,7 @@ SOURCES = \ windows.system.idl \ windows.system.power.idl \ windows.system.userprofile.idl \ + windows.ui.idl \ windowscontracts.idl \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.ui.idl b/include/windows.ui.idl new file mode 100644 index 00000000000..5045d0b9ed2 --- /dev/null +++ b/include/windows.ui.idl @@ -0,0 +1,323 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.UI { + typedef struct Color Color; + typedef struct WindowId WindowId; + + interface IColorHelper; + interface IColorHelperStatics; + interface IColorHelperStatics2; + interface IColors; + interface IColorsStatics; + interface IUIContentRoot; + interface IUIContext; + + runtimeclass ColorHelper; + runtimeclass Colors; + runtimeclass UIContentRoot; + runtimeclass UIContext; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.UI.Color>; + interface Windows.Foundation.Collections.IIterable<Windows.UI.WindowId>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.Color>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.WindowId>; + interface Windows.Foundation.Collections.IVectorView<Windows.UI.WindowId>; + interface Windows.Foundation.IReference<Windows.UI.Color>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct Color + { + BYTE A; + BYTE R; + BYTE G; + BYTE B; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 12.0) + ] + struct WindowId + { + UINT64 Value; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(193cfbe7-65c7-4540-ad08-6283ba76879a) + ] + interface IColorHelper : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(8504dbea-fb6a-4144-a6c2-33499c9284f5) + ] + interface IColorHelperStatics : IInspectable + { + HRESULT FromArgb([in] BYTE a, [in] BYTE r, [in] BYTE g, [in] BYTE b, [out, retval] Windows.UI.Color *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(24d9af02-6eb0-4b94-855c-fcf0818d9a16) + ] + interface IColorHelperStatics2 : IInspectable + { + HRESULT ToDisplayName([in] Windows.UI.Color color, [out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Colors), + uuid(9b8c9326-4ca6-4ce5-8994-9eff65cabdcc) + ] + interface IColors : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Colors), + uuid(cff52e04-cca6-4614-a17e-754910c84a99) + ] + interface IColorsStatics : IInspectable + { + [propget] HRESULT AliceBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT AntiqueWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT Aqua([out, retval] Windows.UI.Color *value); + [propget] HRESULT Aquamarine([out, retval] Windows.UI.Color *value); + [propget] HRESULT Azure([out, retval] Windows.UI.Color *value); + [propget] HRESULT Beige([out, retval] Windows.UI.Color *value); + [propget] HRESULT Bisque([out, retval] Windows.UI.Color *value); + [propget] HRESULT Black([out, retval] Windows.UI.Color *value); + [propget] HRESULT BlanchedAlmond([out, retval] Windows.UI.Color *value); + [propget] HRESULT Blue([out, retval] Windows.UI.Color *value); + [propget] HRESULT BlueViolet([out, retval] Windows.UI.Color *value); + [propget] HRESULT Brown([out, retval] Windows.UI.Color *value); + [propget] HRESULT BurlyWood([out, retval] Windows.UI.Color *value); + [propget] HRESULT CadetBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Chartreuse([out, retval] Windows.UI.Color *value); + [propget] HRESULT Chocolate([out, retval] Windows.UI.Color *value); + [propget] HRESULT Coral([out, retval] Windows.UI.Color *value); + [propget] HRESULT CornflowerBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Cornsilk([out, retval] Windows.UI.Color *value); + [propget] HRESULT Crimson([out, retval] Windows.UI.Color *value); + [propget] HRESULT Cyan([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkCyan([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkGoldenrod([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkKhaki([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkMagenta([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkOliveGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkOrange([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkOrchid([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSalmon([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSlateBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSlateGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkTurquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkViolet([out, retval] Windows.UI.Color *value); + [propget] HRESULT DeepPink([out, retval] Windows.UI.Color *value); + [propget] HRESULT DeepSkyBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT DimGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT DodgerBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Firebrick([out, retval] Windows.UI.Color *value); + [propget] HRESULT FloralWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT ForestGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT Fuchsia([out, retval] Windows.UI.Color *value); + [propget] HRESULT Gainsboro([out, retval] Windows.UI.Color *value); + [propget] HRESULT GhostWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT Gold([out, retval] Windows.UI.Color *value); + [propget] HRESULT Goldenrod([out, retval] Windows.UI.Color *value); + [propget] HRESULT Gray([out, retval] Windows.UI.Color *value); + [propget] HRESULT Green([out, retval] Windows.UI.Color *value); + [propget] HRESULT GreenYellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT Honeydew([out, retval] Windows.UI.Color *value); + [propget] HRESULT HotPink([out, retval] Windows.UI.Color *value); + [propget] HRESULT IndianRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT Indigo([out, retval] Windows.UI.Color *value); + [propget] HRESULT Ivory([out, retval] Windows.UI.Color *value); + [propget] HRESULT Khaki([out, retval] Windows.UI.Color *value); + [propget] HRESULT Lavender([out, retval] Windows.UI.Color *value); + [propget] HRESULT LavenderBlush([out, retval] Windows.UI.Color *value); + [propget] HRESULT LawnGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT LemonChiffon([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightCoral([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightCyan([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightGoldenrodYellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightPink([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSalmon([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSkyBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSlateGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSteelBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightYellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT Lime([out, retval] Windows.UI.Color *value); + [propget] HRESULT LimeGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT Linen([out, retval] Windows.UI.Color *value); + [propget] HRESULT Magenta([out, retval] Windows.UI.Color *value); + [propget] HRESULT Maroon([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumAquamarine([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumOrchid([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumPurple([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumSeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumSlateBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumSpringGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumTurquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumVioletRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT MidnightBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT MintCream([out, retval] Windows.UI.Color *value); + [propget] HRESULT MistyRose([out, retval] Windows.UI.Color *value); + [propget] HRESULT Moccasin([out, retval] Windows.UI.Color *value); + [propget] HRESULT NavajoWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT Navy([out, retval] Windows.UI.Color *value); + [propget] HRESULT OldLace([out, retval] Windows.UI.Color *value); + [propget] HRESULT Olive([out, retval] Windows.UI.Color *value); + [propget] HRESULT OliveDrab([out, retval] Windows.UI.Color *value); + [propget] HRESULT Orange([out, retval] Windows.UI.Color *value); + [propget] HRESULT OrangeRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT Orchid([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleGoldenrod([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleTurquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleVioletRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT PapayaWhip([out, retval] Windows.UI.Color *value); + [propget] HRESULT PeachPuff([out, retval] Windows.UI.Color *value); + [propget] HRESULT Peru([out, retval] Windows.UI.Color *value); + [propget] HRESULT Pink([out, retval] Windows.UI.Color *value); + [propget] HRESULT Plum([out, retval] Windows.UI.Color *value); + [propget] HRESULT PowderBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Purple([out, retval] Windows.UI.Color *value); + [propget] HRESULT Red([out, retval] Windows.UI.Color *value); + [propget] HRESULT RosyBrown([out, retval] Windows.UI.Color *value); + [propget] HRESULT RoyalBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT SaddleBrown([out, retval] Windows.UI.Color *value); + [propget] HRESULT Salmon([out, retval] Windows.UI.Color *value); + [propget] HRESULT SandyBrown([out, retval] Windows.UI.Color *value); + [propget] HRESULT SeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT SeaShell([out, retval] Windows.UI.Color *value); + [propget] HRESULT Sienna([out, retval] Windows.UI.Color *value); + [propget] HRESULT Silver([out, retval] Windows.UI.Color *value); + [propget] HRESULT SkyBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT SlateBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT SlateGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT Snow([out, retval] Windows.UI.Color *value); + [propget] HRESULT SpringGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT SteelBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Tan([out, retval] Windows.UI.Color *value); + [propget] HRESULT Teal([out, retval] Windows.UI.Color *value); + [propget] HRESULT Thistle([out, retval] Windows.UI.Color *value); + [propget] HRESULT Tomato([out, retval] Windows.UI.Color *value); + [propget] HRESULT Transparent([out, retval] Windows.UI.Color *value); + [propget] HRESULT Turquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT Violet([out, retval] Windows.UI.Color *value); + [propget] HRESULT Wheat([out, retval] Windows.UI.Color *value); + [propget] HRESULT White([out, retval] Windows.UI.Color *value); + [propget] HRESULT WhiteSmoke([out, retval] Windows.UI.Color *value); + [propget] HRESULT Yellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT YellowGreen([out, retval] Windows.UI.Color *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.UIContentRoot), + uuid(1dfcbac6-b36b-5cb9-9bc5-2b7a0eddc378) + ] + interface IUIContentRoot : IInspectable + { + [propget] HRESULT UIContext([out, retval] Windows.UI.UIContext **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.UIContext), + uuid(bb5cfacd-5bd8-59d0-a59e-1c17a4d6d243) + ] + interface IUIContext : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.IColorHelperStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.UI.IColorHelperStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass ColorHelper + { + [default] interface Windows.UI.IColorHelper; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.IColorsStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass Colors + { + [default] interface Windows.UI.IColors; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass UIContentRoot + { + [default] interface Windows.UI.IUIContentRoot; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass UIContext + { + [default] interface Windows.UI.IUIContext; + } +} -- 2.36.0

2 3

[PATCH] include: Add declarations of _alloca and alloca for MSVC mode
by Martin Storsjö 25 Apr '22

25 Apr '22

This fixes builds with recent Clang 15 (which still is in development), which errors out on implicit declarations. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- Doing this as two separate ifdef blocks, to get the plain C function declaration (which actually is a builtin intrinsic, but it needs to be declared) within the extern "C" scope. --- include/msvcrt/malloc.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index 5bb843be5a6..fcbadbeb4e0 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -77,6 +77,10 @@ _ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); _ACRTIMP size_t __cdecl _get_sbh_threshold(void); _ACRTIMP int __cdecl _set_sbh_threshold(size_t size); +#ifdef _MSC_VER +void *_alloca(size_t size); +#endif + #ifdef __cplusplus } #endif @@ -84,6 +88,8 @@ _ACRTIMP int __cdecl _set_sbh_threshold(size_t size); # ifdef __GNUC__ # define _alloca(x) __builtin_alloca((x)) # define alloca(x) __builtin_alloca((x)) +# elif defined(_MSC_VER) +# define alloca(x) _alloca((x)) # endif #endif /* __WINE_MALLOC_H */ -- 2.25.1

1 0

[PATCH] include: Add a declaration of _InterlockedExchangeAdd64 for MSVC mode for aarch64
by Martin Storsjö 25 Apr '22

25 Apr '22

This matches the corresponding declaration for x86_64. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/winnt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 31c6b7d69e9..e853ddbc7ae 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6371,6 +6371,10 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__aarch64__) +#pragma intrinsic(_InterlockedExchangeAdd64) + +long long _InterlockedExchangeAdd64(long long volatile *, long long); + static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM64_BARRIER_SY); -- 2.25.1

1 0

[PATCH v4] windows.networking: Add stub dll.
by Zhiyi Zhang 25 Apr '22

25 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 233210. Remove unnecessary ordinal numbers. v4: Supersede 233635. Add SetSocketMediaStreamingMode() stub. Thanks, Rémi. configure.ac | 1 + dlls/windows.networking/Makefile.in | 4 +++ dlls/windows.networking/main.c | 29 +++++++++++++++++ .../windows.networking.spec | 8 +++++ include/socketapi.h | 32 +++++++++++++++++++ 5 files changed, 74 insertions(+) create mode 100644 dlls/windows.networking/Makefile.in create mode 100644 dlls/windows.networking/main.c create mode 100644 dlls/windows.networking/windows.networking.spec create mode 100644 include/socketapi.h diff --git a/configure.ac b/configure.ac index 75292210bc4..74c80fd7fa8 100644 --- a/configure.ac +++ b/configure.ac @@ -3098,6 +3098,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.networking) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.networking/Makefile.in b/dlls/windows.networking/Makefile.in new file mode 100644 index 00000000000..19ca237ec36 --- /dev/null +++ b/dlls/windows.networking/Makefile.in @@ -0,0 +1,4 @@ +MODULE = windows.networking.dll + +C_SRCS = \ + main.c diff --git a/dlls/windows.networking/main.c b/dlls/windows.networking/main.c new file mode 100644 index 00000000000..3ac8a3042ab --- /dev/null +++ b/dlls/windows.networking/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 <windef.h> +#include <winnt.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winsock); + +HRESULT WINAPI SetSocketMediaStreamingMode(BOOL value) +{ + FIXME("value %d stub!\n", value); + return S_OK; +} diff --git a/dlls/windows.networking/windows.networking.spec b/dlls/windows.networking/windows.networking.spec new file mode 100644 index 00000000000..49fdb3aab18 --- /dev/null +++ b/dlls/windows.networking/windows.networking.spec @@ -0,0 +1,8 @@ +1 stub @ +@ stub DllCanUnloadNow +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub DllMain +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stdcall SetSocketMediaStreamingMode(long) diff --git a/include/socketapi.h b/include/socketapi.h new file mode 100644 index 00000000000..a3e8220972f --- /dev/null +++ b/include/socketapi.h @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef SOCKETAPI_H +#define SOCKETAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI SetSocketMediaStreamingMode(BOOL value); + +#ifdef __cplusplus +} +#endif + +#endif /* SOCKETAPI_H */ -- 2.32.0

1 0

[PATCH v2 6/6] nsiproxy: Enable compilation with long types.
by Huw Davies 25 Apr '22

25 Apr '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 1 - dlls/nsiproxy.sys/device.c | 10 +++++----- dlls/nsiproxy.sys/tcp.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 3b83a4ddaac..87f7e165ef4 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nsiproxy.sys UNIXLIB = nsiproxy.so IMPORTS = ntoskrnl diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index cc9b00d3359..d3845829a85 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -266,7 +266,7 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -290,7 +290,7 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; break; } @@ -316,7 +316,7 @@ static int add_device( DRIVER_OBJECT *driver ) status = IoCreateSymbolicLink( &link, &name ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return 0; } @@ -341,7 +341,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; status = nsiproxy_call( icmp_listen, &params ); - TRACE( "icmp_listen rets %08x\n", status ); + TRACE( "icmp_listen rets %08lx\n", status ); EnterCriticalSection( &nsiproxy_cs ); @@ -375,7 +375,7 @@ static void handle_queued_send_echo( IRP *irp ) params.dst = &in->dst; status = nsiproxy_call( icmp_send_echo, &params ); - TRACE( "icmp_send_echo rets %08x\n", status ); + TRACE( "icmp_send_echo rets %08lx\n", status ); if (status != STATUS_PENDING) { diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 0dbee8418b9..5734c4d9ee0 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -404,7 +404,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN unsigned int i, len_socket; char socket[32]; - sprintf( socket, "socket:[%lu]", inode ); + sprintf( socket, "socket:[%zu]", inode ); len_socket = strlen( socket ); for (i = 0; i < num_entries; i++) { -- 2.23.0

1 0

[PATCH v2 5/6] nsiproxy: Add intermediate variables for sscanf on ULONG.
by Huw Davies 25 Apr '22

25 Apr '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/tcp.c | 7 +++++-- dlls/nsiproxy.sys/udp.c | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 8e2d7e749a7..0dbee8418b9 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -534,6 +534,7 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k FILE *fp; char buf[512], *ptr; int inode; + UINT laddr, raddr; if (!(fp = fopen( "/proc/net/tcp", "r" ))) return ERROR_NOT_SUPPORTED; @@ -547,15 +548,17 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k while ((ptr = fgets( buf, sizeof(buf), fp ))) { if (sscanf( ptr, "%*x: %x:%hx %x:%hx %x %*s %*s %*s %*s %*s %d", - &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, - &key.remote.Ipv4.sin_addr.WS_s_addr, &key.remote.Ipv4.sin_port, + &laddr, &key.local.Ipv4.sin_port, + &raddr, &key.remote.Ipv4.sin_port, &dyn.state, &inode ) != 6) continue; dyn.state = tcp_state_to_mib_state( dyn.state ); if (filter && filter != dyn.state ) continue; key.local.Ipv4.sin_family = key.remote.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = laddr; key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); + key.remote.Ipv4.sin_addr.WS_s_addr = raddr; key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); if (num < *count) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 0ba2f835e44..2248d74234b 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -223,6 +223,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void FILE *fp; char buf[512], *ptr; int inode; + UINT addr; if (!(fp = fopen( "/proc/net/udp", "r" ))) return ERROR_NOT_SUPPORTED; @@ -235,10 +236,11 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void while ((ptr = fgets( buf, sizeof(buf), fp ))) { if (sscanf( ptr, "%*u: %x:%hx %*s %*s %*s %*s %*s %*s %*s %d", - &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, &inode ) != 3) + &addr, &key.local.Ipv4.sin_port, &inode ) != 3) continue; key.local.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = addr; key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); -- 2.23.0

1 0