August 2023 - Wine-commits - list.winehq.org

Eric Pouech : msvcrt: Fix freopen() on FILE with invalid underlying fd.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 626f8d75e8b525e736c31f1e4f767a26d66c89af URL: https://gitlab.winehq.org/wine/wine/-/commit/626f8d75e8b525e736c31f1e4f767a… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Aug 17 10:16:37 2023 +0200 msvcrt: Fix freopen() on FILE with invalid underlying fd. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 +--- dlls/msvcrt/tests/file.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e72784eef41..24d801a5306 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4588,9 +4588,7 @@ FILE* CDECL _wfreopen(const wchar_t *path, const wchar_t *mode, FILE* file) TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file ? file->_file : -1); LOCK_FILES(); - if (!file || ((fd = file->_file) < 0)) - file = NULL; - else + if (file) { fclose(file); if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 51ba4225032..15f18a395c8 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1236,6 +1236,25 @@ static void test_freopen( void ) ok(ret == EOF, "fclose(file) succeeded\n"); ok(errno == 0xdeadbeef, "errno is %d\n", errno); + file = fopen(filename1, "rb"); + ok(file != NULL, "couldn't open %s\n", filename1); + close(file->_file); + file->_file = -1; + + new = freopen(filename2, "rb", file); + ok(new == file, "freopen() didn't return same FILE*\n"); + + fd = fileno(file); + ok(fd > 0, "fileno() returned %d\n", fd); + + ch = '#'; + ret = fread(&ch, 1, 1, file); + ok(ret == 1, "fread() returned %d\n", ret); + ok(ch == '2', "Unexpected char\n"); + + ret = fclose(file); + ok(ret == 0, "fclose(file) returned %d\n", ret); + unlink(filename1); unlink(filename2); }

1 0

Alexandre Julliard : ntdll/tests: Add some more tests for the contents of the WOW64INFO structure.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 572cc841a60a5cc0219b8dbf7cb614a0ee6f3456 URL: https://gitlab.winehq.org/wine/wine/-/commit/572cc841a60a5cc0219b8dbf7cb614… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 17 13:54:02 2023 +0200 ntdll/tests: Add some more tests for the contents of the WOW64INFO structure. --- dlls/ntdll/tests/wow64.c | 22 ++++++++++++++++++++++ include/winternl.h | 16 +++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 300494849b9..0689e7a530a 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -414,6 +414,28 @@ static void test_peb_teb(void) } ok( i < limit, "wow64info not found in PEB\n" ); } + if (wow64info->SectionHandle && wow64info->CrossProcessWorkList) + { + HANDLE handle; + void *data, *addr = NULL; + SIZE_T size = 0; + + ret = DuplicateHandle( pi.hProcess, (HANDLE)(ULONG_PTR)wow64info->SectionHandle, + GetCurrentProcess(), &handle, 0, FALSE, DUPLICATE_SAME_ACCESS ); + ok( ret, "DuplicateHandle failed %lu\n", GetLastError() ); + status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, NULL, + &size, ViewShare, 0, PAGE_READWRITE ); + ok( !status, "NtMapViewOfSection failed %lx\n", status ); + data = malloc( size ); + ret = ReadProcessMemory( pi.hProcess, (void *)(ULONG_PTR)wow64info->CrossProcessWorkList, + data, size, &size ); + ok( ret, "ReadProcessMemory failed %lu\n", GetLastError() ); + ok( !memcmp( data, addr, size ), "wrong data\n" ); + free( data ); + UnmapViewOfFile( addr ); + CloseHandle( handle ); + } + else trace( "no WOW64INFO section handle\n" ); } else win_skip( "RtlWow64GetSharedInfoProcess not supported\n" ); diff --git a/include/winternl.h b/include/winternl.h index 62ccdd6c95a..4b58d481603 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4103,14 +4103,16 @@ typedef struct _WOW64_CPU_AREA_INFO typedef struct _WOW64INFO { - ULONG NativeSystemPageSize; - ULONG CpuFlags; - ULONG Wow64ExecuteFlags; - ULONG unknown[5]; - USHORT NativeMachineType; - USHORT EmulatedMachineType; - ULONG unknown2; + ULONG NativeSystemPageSize; + ULONG CpuFlags; + ULONG Wow64ExecuteFlags; + ULONG unknown; + ULONGLONG SectionHandle; + ULONGLONG CrossProcessWorkList; + USHORT NativeMachineType; + USHORT EmulatedMachineType; } WOW64INFO; +C_ASSERT( sizeof(WOW64INFO) == 40 ); #define WOW64_CPUFLAGS_MSFT64 0x01 #define WOW64_CPUFLAGS_SOFTWARE 0x02

1 0

Nikolay Sivov : mf: Implement MFCreateSequencerSegmentOffset().
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 42811d775b1a299f1dddcbbae4a2b80cb1b77698 URL: https://gitlab.winehq.org/wine/wine/-/commit/42811d775b1a299f1dddcbbae4a2b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 17 10:42:47 2023 +0200 mf: Implement MFCreateSequencerSegmentOffset(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 17 ++++++++++++ dlls/mf/topology.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index e207ca23a8e..9477cdda61e 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -56,7 +56,7 @@ @ stdcall MFCreateSampleCopierMFT(ptr) @ stdcall MFCreateSampleGrabberSinkActivate(ptr ptr ptr) @ stub MFCreateSecureHttpSchemePlugin -@ stub MFCreateSequencerSegmentOffset +@ stdcall MFCreateSequencerSegmentOffset(long int64 ptr) @ stdcall MFCreateSequencerSource(ptr ptr) @ stub MFCreateSequencerSourceRemoteStream @ stdcall MFCreateSimpleTypeHandler(ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 743946f7fba..4f4a282a9d8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -7051,6 +7051,22 @@ static void test_mpeg4_media_sink(void) IMFMediaType_Release(audio_type); } +static void test_MFCreateSequencerSegmentOffset(void) +{ + PROPVARIANT propvar; + HRESULT hr; + + hr = MFCreateSequencerSegmentOffset(0, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + propvar.vt = VT_EMPTY; + hr = MFCreateSequencerSegmentOffset(0, 0, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_UNKNOWN, "Unexpected type %d.\n", propvar.vt); + ok(!!propvar.punkVal, "Unexpected pointer.\n"); + PropVariantClear(&propvar); +} + START_TEST(mf) { init_functions(); @@ -7085,4 +7101,5 @@ START_TEST(mf) test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); test_mpeg4_media_sink(); + test_MFCreateSequencerSegmentOffset(); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index b684b17ff72..f09a9c87a46 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2230,3 +2230,79 @@ HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource ** return S_OK; } + +struct segment_offset +{ + IUnknown IUnknown_iface; + LONG refcount; + MFSequencerElementId id; + MFTIME timeoffset; +}; + +static inline struct segment_offset *impl_offset_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct segment_offset, IUnknown_iface); +} + +static HRESULT WINAPI segment_offset_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI segment_offset_AddRef(IUnknown *iface) +{ + struct segment_offset *offset = impl_offset_from_IUnknown(iface); + return InterlockedIncrement(&offset->refcount); +} + +static ULONG WINAPI segment_offset_Release(IUnknown *iface) +{ + struct segment_offset *offset = impl_offset_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&offset->refcount); + + if (!refcount) + free(offset); + + return refcount; +} + +static const IUnknownVtbl segment_offset_vtbl = +{ + segment_offset_QueryInterface, + segment_offset_AddRef, + segment_offset_Release, +}; + +/*********************************************************************** + * MFCreateSequencerSegmentOffset (mf.@) + */ +HRESULT WINAPI MFCreateSequencerSegmentOffset(MFSequencerElementId id, MFTIME timeoffset, PROPVARIANT *ret) +{ + struct segment_offset *offset; + + TRACE("%#lx, %s, %p.\n", id, debugstr_time(timeoffset), ret); + + if (!ret) + return E_POINTER; + + if (!(offset = calloc(1, sizeof(*offset)))) + return E_OUTOFMEMORY; + + offset->IUnknown_iface.lpVtbl = &segment_offset_vtbl; + offset->refcount = 1; + offset->id = id; + offset->timeoffset = timeoffset; + + V_VT(ret) = VT_UNKNOWN; + V_UNKNOWN(ret) = &offset->IUnknown_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 94bf1a2036c..b3201b12d84 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -709,6 +709,7 @@ cpp_quote("HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handle cpp_quote("HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform);") cpp_quote("HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type,") cpp_quote(" IMFSampleGrabberSinkCallback *callback, IMFActivate **activate);") +cpp_quote("HRESULT WINAPI MFCreateSequencerSegmentOffset(MFSequencerElementId id, MFTIME offset, PROPVARIANT *segment_offset);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager);")

1 0

Alex Henrie : cmd: Introduce an option_equals helper for WCMD_parse_forf_options.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: c27f8f72d15195abd4caccd83a2c96a87e7954a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c27f8f72d15195abd4caccd83a2c96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 20:37:35 2023 -0600 cmd: Introduce an option_equals helper for WCMD_parse_forf_options. --- programs/cmd/builtins.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index badf41c17f6..397eb567277 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1631,6 +1631,19 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, return; } +static BOOL option_equals(WCHAR **haystack, const WCHAR *needle) +{ + int len = wcslen(needle); + + if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + *haystack, len, needle, len) == CSTR_EQUAL) { + *haystack += len; + return TRUE; + } + + return FALSE; +} + /***************************************************************************** * WCMD_parse_forf_options * @@ -1653,11 +1666,6 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, WCHAR *pos = options; int len = lstrlenW(pos); - const int eol_len = lstrlenW(L"eol="); - const int skip_len = lstrlenW(L"skip="); - const int tokens_len = lstrlenW(L"tokens="); - const int delims_len = lstrlenW(L"delims="); - const int usebackq_len = lstrlenW(L"usebackq"); /* Initialize to defaults */ lstrcpyW(delims, L" \t"); @@ -1678,36 +1686,28 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, pos++; /* Save End of line character (Ignore line if first token (based on delims) starts with it) */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, eol_len, L"eol=", eol_len) == CSTR_EQUAL) { - *eol = *(pos + eol_len); - pos = pos + eol_len + 1; + } else if (option_equals(&pos, L"eol=")) { + *eol = *pos++; WINE_TRACE("Found eol as %c(%x)\n", *eol, *eol); /* Save number of lines to skip (Can be in base 10, hex (0x...) or octal (0xx) */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, skip_len, L"skip=", skip_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"skip=")) { WCHAR *nextchar = NULL; - pos = pos + skip_len; *skip = wcstoul(pos, &nextchar, 0); WINE_TRACE("Found skip as %d lines\n", *skip); pos = nextchar; /* Save if usebackq semantics are in effect */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, pos, - usebackq_len, L"usebackq", usebackq_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"usebackq")) { *usebackq = TRUE; - pos = pos + usebackq_len; WINE_TRACE("Found usebackq\n"); /* Save the supplied delims. Slightly odd as space can be a delimiter but only if you finish the optionsroot string with delims= otherwise the space is just a token delimiter! */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, delims_len, L"delims=", delims_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"delims=")) { int i=0; - pos = pos + delims_len; while (*pos && *pos != ' ') { delims[i++] = *pos; pos++; @@ -1717,11 +1717,9 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, WINE_TRACE("Found delims as '%s'\n", wine_dbgstr_w(delims)); /* Save the tokens being requested */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - pos, tokens_len, L"tokens=", tokens_len) == CSTR_EQUAL) { + } else if (option_equals(&pos, L"tokens=")) { int i=0; - pos = pos + tokens_len; while (*pos && *pos != ' ') { tokens[i++] = *pos; pos++;

1 0

Mohamad Al-Jaf : include: Add IPackageStatics interface definition.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: fe877fdf8a130e4d3721dc63e6c12ca8bb1787a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe877fdf8a130e4d3721dc63e6c12c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 6 19:11:20 2023 -0500 include: Add IPackageStatics interface definition. --- include/windows.applicationmodel.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index cea2c9423d8..9514c06a60e 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -93,6 +93,16 @@ namespace Windows.ApplicationModel { [propget] HRESULT Author([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.Package), + uuid(4e534bdf-2960-4878-97a4-9624deb72f2d) + ] + interface IPackageStatics : IInspectable + { + [propget] HRESULT Current([out, retval] Windows.ApplicationModel.Package **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -102,6 +112,14 @@ namespace Windows.ApplicationModel { runtimeclass Package { [default] interface Windows.ApplicationModel.IPackage; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackage2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackage3; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackageWithMetadata; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.ApplicationModel.IPackage4; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackage5; + [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.ApplicationModel.IPackage6; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.ApplicationModel.IPackage7; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.ApplicationModel.IPackage8; } [

1 0

Mohamad Al-Jaf : include: Add IRandomAccessStream interface definition.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 711f9e1fc55d26237d91cebeac3e6c9892a545a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/711f9e1fc55d26237d91cebeac3e6c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 25 21:43:52 2022 -0500 include: Add IRandomAccessStream interface definition. Needed by IStorageFile. --- include/windows.storage.streams.idl | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index 9255fb43ff3..bcbdf588ec6 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -30,14 +30,19 @@ namespace Windows.Storage.Streams { interface IBufferStatics; interface IContentTypeProvider; interface IInputStream; + interface IInputStreamReference; interface IOutputStream; interface IRandomAccessStream; + interface IRandomAccessStreamReference; + interface IRandomAccessStreamStatics; interface IRandomAccessStreamWithContentType; runtimeclass Buffer; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IBuffer *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IRandomAccessStream *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStream *>; } [ @@ -75,6 +80,26 @@ namespace Windows.Storage.Streams { [out, retval] Windows.Foundation.MemoryBuffer **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(905a0fe1-bc53-11df-8c49-001e4fc686da), + ] + interface IRandomAccessStream : IInspectable + requires Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream + { + [propget] HRESULT Size([out, retval] UINT64 *value); + [propput] HRESULT Size([in] UINT64 value); + HRESULT GetInputStreamAt([in] UINT64 position, [out, retval] Windows.Storage.Streams.IInputStream **stream); + HRESULT GetOutputStreamAt([in] UINT64 position, [out, retval] Windows.Storage.Streams.IOutputStream **stream); + [propget] HRESULT Position([out, retval] UINT64 *value); + HRESULT Seek([in] UINT64 position); + HRESULT CloneStream([out, retval] Windows.Storage.Streams.IRandomAccessStream **stream); + [propget] HRESULT CanRead([out, retval] boolean *value); + [propget] HRESULT CanWrite([out, retval] boolean *value); + } + [ uuid(cc254827-4b3d-438f-9232-10c76bc7e038), ] @@ -88,6 +113,15 @@ namespace Windows.Storage.Streams { { } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Storage.Streams.IRandomAccessStreamStatics, Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass RandomAccessStream + { + } + [ activatable(Windows.Storage.Streams.IBufferFactory, Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),

1 0

Mohamad Al-Jaf : include: Add IStorageFile interface definition.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 915db53124f6a8908abd9c1ab38c2ca29ac036cb URL: https://gitlab.winehq.org/wine/wine/-/commit/915db53124f6a8908abd9c1ab38c2c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Dec 26 18:24:11 2022 -0500 include: Add IStorageFile interface definition. Needed by IStorageFolder. --- include/windows.storage.idl | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/include/windows.storage.idl b/include/windows.storage.idl index de918ddc104..aa050040640 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -20,13 +20,139 @@ #pragma winrt ns_prefix #endif +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; import "windows.foundation.idl"; +/* import "windows.storage.fileproperties.idl"; */ +/* import "windows.storage.provider.idl"; */ +/* import "windows.storage.search.idl"; */ +import "windows.storage.streams.idl"; +import "windows.system.idl"; namespace Windows.Storage { + typedef enum FileAccessMode FileAccessMode; + typedef enum NameCollisionOption NameCollisionOption; + interface IStorageFolder; interface IStorageFolderStatics; + interface IStorageFolderStatics2; + interface IStorageFileStatics; + interface IStorageFileStatics2; + interface IStorageItem; runtimeclass StorageFolder; + runtimeclass StorageFile; + runtimeclass StorageStreamTransaction; + + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFile *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageStreamTransaction *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageStreamTransaction *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum FileAccessMode + { + Read = 0, + ReadWrite = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum NameCollisionOption + { + GenerateUniqueName = 0, + ReplaceExisting = 1, + FailIfExists = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(fa3f6186-4214-428c-a64c-14c9ac7315ea) + ] + interface IStorageFile : IInspectable + requires Windows.Storage.IStorageItem, + Windows.Storage.Streams.IRandomAccessStreamReference, + Windows.Storage.Streams.IInputStreamReference + { + [propget] HRESULT FileType([out, retval] HSTRING *value); + [propget] HRESULT ContentType([out, retval] HSTRING *value); + HRESULT OpenAsync( + [in] Windows.Storage.FileAccessMode mode, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStream *> **operation + ); + HRESULT OpenTransactedWriteAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageStreamTransaction *> **operation); + [overload("CopyAsync")] + HRESULT CopyOverloadDefaultNameAndOptions( + [in] Windows.Storage.IStorageFolder *folder, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation + ); + [overload("CopyAsync")] + HRESULT CopyOverloadDefaultOptions( + [in] Windows.Storage.IStorageFolder *folder, + [in] HSTRING name, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation); + [overload("CopyAsync")] + HRESULT CopyOverload( + [in] Windows.Storage.IStorageFolder *folder, + [in] HSTRING name, + [in] Windows.Storage.NameCollisionOption option, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation + ); + HRESULT CopyAndReplaceAsync([in] Windows.Storage.IStorageFile *file, [out, retval] Windows.Foundation.IAsyncAction **operation); + [overload("MoveAsync")] + HRESULT MoveOverloadDefaultNameAndOptions([in] Windows.Storage.IStorageFolder *folder, [out, retval] Windows.Foundation.IAsyncAction **operation); + [overload("MoveAsync")] + HRESULT MoveOverloadDefaultOptions( + [in] Windows.Storage.IStorageFolder *folder, + [in] HSTRING name, + [out, retval] Windows.Foundation.IAsyncAction **operation + ); + [overload("MoveAsync")] + HRESULT MoveOverload( + [in] Windows.Storage.IStorageFolder *folder, + [in] HSTRING name, + [in] Windows.Storage.NameCollisionOption option, + [out, retval] Windows.Foundation.IAsyncAction **operation); + HRESULT MoveAndReplaceAsync([in] Windows.Storage.IStorageFile *file, [out, retval] Windows.Foundation.IAsyncAction **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.StorageStreamTransaction), + uuid(f67cf363-a53d-4d94-ae2c-67232d93acdd) + ] + interface IStorageStreamTransaction : IInspectable + requires Windows.Foundation.IClosable + { + [propget] HRESULT Stream([out, retval] Windows.Storage.Streams.IRandomAccessStream **value); + HRESULT CommitAsync([out, retval] Windows.Foundation.IAsyncAction **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IStorageFileStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IStorageFileStatics2, Windows.Foundation.UniversalApiContract, 10.0) + ] + runtimeclass StorageFile + { + [default] interface Windows.Storage.IStorageFile; + interface Windows.Storage.Streams.IInputStreamReference; + interface Windows.Storage.Streams.IRandomAccessStreamReference; + interface Windows.Storage.IStorageItem; + interface Windows.Storage.IStorageItemProperties; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemProperties2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItem2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFilePropertiesWithAvailability; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFile2; + } [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -36,4 +162,13 @@ namespace Windows.Storage { { [default] interface Windows.Storage.IStorageFolder; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass StorageStreamTransaction + { + [default] interface Windows.Storage.IStorageStreamTransaction; + interface Windows.Foundation.IClosable; + } }

1 0

Mohamad Al-Jaf : include: Add windows.storage.fileproperties.idl file.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: 90cdfc5157a8d44468b907dfdb306486dad83449 URL: https://gitlab.winehq.org/wine/wine/-/commit/90cdfc5157a8d44468b907dfdb3064… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 26 02:28:39 2023 -0400 include: Add windows.storage.fileproperties.idl file. Needed by IStorageItem. --- include/Makefile.in | 1 + include/windows.storage.fileproperties.idl | 62 ++++++++++++++++++++++++++++++ include/windows.storage.idl | 2 +- 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index afc043ca671..7904292560b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -847,6 +847,7 @@ SOURCES = \ windows.security.credentials.idl \ windows.security.cryptography.idl \ windows.security.isolation.idl \ + windows.storage.fileproperties.idl \ windows.storage.idl \ windows.storage.streams.idl \ windows.system.idl \ diff --git a/include/windows.storage.fileproperties.idl b/include/windows.storage.fileproperties.idl new file mode 100644 index 00000000000..9426d02fefb --- /dev/null +++ b/include/windows.storage.fileproperties.idl @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 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"; +import "windows.devices.geolocation.idl"; +/* import "windows.storage.idl"; */ +import "windows.storage.streams.idl"; + +namespace Windows.Storage.FileProperties { + interface IBasicProperties; + + runtimeclass BasicProperties; + + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.FileProperties.BasicProperties *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.FileProperties.BasicProperties *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.FileProperties.BasicProperties), + uuid(d05d55db-785e-4a66-be02-9beec58aea81) + ] + interface IBasicProperties : IInspectable + { + [propget] HRESULT Size([out, retval] UINT64 *value); + [propget] HRESULT DateModified([out, retval] Windows.Foundation.DateTime *value); + [propget] HRESULT ItemDate([out, retval] Windows.Foundation.DateTime *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + runtimeclass BasicProperties + { + [default] interface Windows.Storage.FileProperties.IBasicProperties; + interface Windows.Storage.FileProperties.IStorageItemExtraProperties; + } +} diff --git a/include/windows.storage.idl b/include/windows.storage.idl index aa050040640..c0bfad2589c 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -25,7 +25,7 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -/* import "windows.storage.fileproperties.idl"; */ +import "windows.storage.fileproperties.idl"; /* import "windows.storage.provider.idl"; */ /* import "windows.storage.search.idl"; */ import "windows.storage.streams.idl";

1 0

Mohamad Al-Jaf : include: Add IStorageItem interface definition.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: ba392b4cef06c769c000bb5f2c4f648fba6127bc URL: https://gitlab.winehq.org/wine/wine/-/commit/ba392b4cef06c769c000bb5f2c4f64… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Dec 26 21:35:17 2022 -0500 include: Add IStorageItem interface definition. Needed by IStorageFolder. --- include/windows.storage.idl | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/windows.storage.idl b/include/windows.storage.idl index c0bfad2589c..67a1835bd44 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -33,7 +33,10 @@ import "windows.system.idl"; namespace Windows.Storage { typedef enum FileAccessMode FileAccessMode; + typedef enum FileAttributes FileAttributes; typedef enum NameCollisionOption NameCollisionOption; + typedef enum StorageDeleteOption StorageDeleteOption; + typedef enum StorageItemTypes StorageItemTypes; interface IStorageFolder; interface IStorageFolderStatics; @@ -62,6 +65,21 @@ namespace Windows.Storage { ReadWrite = 1, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + flags + ] + enum FileAttributes + { + Normal = 0x0, + ReadOnly = 0x1, + Directory = 0x10, + Archive = 0x20, + Temporary = 0x100, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + LocallyIncomplete = 0x200, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -72,6 +90,26 @@ namespace Windows.Storage { FailIfExists = 2, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum StorageDeleteOption + { + Default = 0, + PermanentDelete = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + flags + ] + enum StorageItemTypes + { + None = 0x0, + File = 0x1, + Folder = 0x2, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(fa3f6186-4214-428c-a64c-14c9ac7315ea) @@ -123,6 +161,28 @@ namespace Windows.Storage { HRESULT MoveAndReplaceAsync([in] Windows.Storage.IStorageFile *file, [out, retval] Windows.Foundation.IAsyncAction **operation); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(4207a996-ca2f-42f7-bde8-8b10457a7f30) + ] + interface IStorageItem : IInspectable + { + [overload("RenameAsync")] + HRESULT RenameAsyncOverloadDefaultOptions([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncAction **operation); + [overload("RenameAsync")] + HRESULT RenameAsync([in] HSTRING name, [in] Windows.Storage.NameCollisionOption option, [out, retval] Windows.Foundation.IAsyncAction **operation); + [overload("DeleteAsync")] + HRESULT DeleteAsyncOverloadDefaultOptions([out, retval] Windows.Foundation.IAsyncAction **operation); + [overload("DeleteAsync")] + HRESULT DeleteAsync([in] Windows.Storage.StorageDeleteOption option, [out, retval] Windows.Foundation.IAsyncAction **operation); + HRESULT GetBasicPropertiesAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.FileProperties.BasicProperties *> **operation); + [propget] HRESULT Name([out, retval] HSTRING *value); + [propget] HRESULT Path([out, retval] HSTRING *value); + [propget] HRESULT Attributes([out, retval] Windows.Storage.FileAttributes *value); + [propget] HRESULT DateCreated([out, retval] Windows.Foundation.DateTime *value); + HRESULT IsOfType([in] Windows.Storage.StorageItemTypes type, [out, retval] boolean *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Storage.StorageStreamTransaction),

1 0

Mohamad Al-Jaf : include: Add windows.storage.search.idl file.
by Alexandre Julliard 17 Aug '23

17 Aug '23

Module: wine Branch: master Commit: dcc809627d767080b4cf75410812ae595a695323 URL: https://gitlab.winehq.org/wine/wine/-/commit/dcc809627d767080b4cf75410812ae… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jan 2 16:32:52 2023 -0500 include: Add windows.storage.search.idl file. Needed by StorageFolder. --- include/Makefile.in | 1 + include/windows.storage.idl | 2 +- include/windows.storage.search.idl | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index 7904292560b..f4475d9438f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -849,6 +849,7 @@ SOURCES = \ windows.security.isolation.idl \ windows.storage.fileproperties.idl \ windows.storage.idl \ + windows.storage.search.idl \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ diff --git a/include/windows.storage.idl b/include/windows.storage.idl index 67a1835bd44..d46c7430b2b 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -27,7 +27,7 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.storage.fileproperties.idl"; /* import "windows.storage.provider.idl"; */ -/* import "windows.storage.search.idl"; */ +import "windows.storage.search.idl"; import "windows.storage.streams.idl"; import "windows.system.idl"; diff --git a/include/windows.storage.search.idl b/include/windows.storage.search.idl new file mode 100644 index 00000000000..093b0837afb --- /dev/null +++ b/include/windows.storage.search.idl @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 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"; +/* import "windows.data.text.idl"; */ +/* import "windows.storage.idl"; */ +import "windows.storage.fileproperties.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Storage.Search { + interface IStorageFolderQueryOperations; +}

1 0