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

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

Aug. 17, 2023

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

Eric Pouech : msvcrt/tests: Add tests for freopen().
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 65b6e237cdc142bb0dbc9fb48be0c1592a6b80f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/65b6e237cdc142bb0dbc9fb48be0c1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Aug 17 10:16:37 2023 +0200 msvcrt/tests: Add tests for freopen(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/file.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 3f57b3f871f..51ba4225032 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1167,6 +1167,79 @@ static void test_fputwc(void) _unlink(tempfile); } +static void test_freopen( void ) +{ + char filename1[8] = "AXXXXXX"; + char filename2[8] = "BXXXXXX"; + FILE *file; + FILE *new; + int ret; + int fd; + char ch; + long pos; + + mktemp(filename1); + mktemp(filename2); + + file = fopen(filename1, "wt"); + ok(file != NULL, "fopen(filename1) returned NULL\n"); + ret = fwrite("1", 1, 1, file); + ok(ret == 1, "fwrite() returned %d (%d)\n", ret, errno); + ret = fclose(file); + ok(ret == 0, "fclose() returned %d\n", ret); + + file = fopen(filename2, "wt"); + ok(file != NULL, "fopen(filename1) returned NULL\n"); + ret = fwrite("2", 1, 1, file); + ok(ret == 1, "fwrite() returned %d (%d)\n", ret, errno); + ret = fclose(file); + ok(ret == 0, "fclose() returned %d\n", ret); + + file = fopen(filename1, "rt"); + ok(file != NULL, "fopen(filename1) returned NULL\n"); + file = freopen(filename2, "rt", file); + ok(file != NULL, "fopen(filename2) returned NULL\n"); + ch = '#'; + ret = fread(&ch, 1, 1, file); + ok(ret == 1, "fread() returned %d\n", ret); + ok(ch == '2', "fread() read %c\n", ch); + ret = fclose(file); + ok(ret == 0, "fclose() returned %d\n", ret); + + file = fopen(filename1, "at"); + ok(file != NULL, "fopen(filename1) returned NULL\n"); + file = freopen(filename1, "rt", file); + ok(file != NULL, "fopen(filename1) returned NULL\n"); + pos = ftell(file); + ok(pos == 0, "ftell() returned %ld\n", pos); + ch = '#'; + ret = fread(&ch, 1, 1, file); + ok(ret == 1, "fread() returned %d\n", ret); + ok(ch == '1', "fread() read %c\n", ch); + ret = fclose(file); + ok(ret == 0, "fclose() returned %d\n", ret); + + file = fopen(filename1, "rt"); + ok(file != NULL, "fopen(filename1) returned NULL\n"); + fd = fileno(file); + ok(fd > 0, "fileno() returned %d\n", fd); + /* invalid filename */ + new = freopen("_:", "rt", file); + ok(new == NULL, "fopen(_:) returned non NULL\n"); + errno = 0xdeadbeef; + ch = '#'; + ret = read(fd, &ch, 1); + ok(ret == -1, "read() returned %d\n", ret); + ok(errno == EBADF, "errno is %d\n", errno); + errno = 0xdeadbeef; + ret = fclose(file); + ok(ret == EOF, "fclose(file) succeeded\n"); + ok(errno == 0xdeadbeef, "errno is %d\n", errno); + + unlink(filename1); + unlink(filename2); +} + static void test_ctrlz( void ) { char* tempf; @@ -2977,6 +3050,7 @@ START_TEST(file) test_fgetwc_locale("AB\x83\xa9", "C", 0); test_fgetwc_unicode(); test_fputwc(); + test_freopen(); test_ctrlz(); test_file_put_get(); test_tmpnam();

1 0

Alex Henrie : joy: Remove size argument to set_config_key function.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 3505cdbf55d037ca144afbd117ff2877fe4c2acb URL: https://gitlab.winehq.org/wine/wine/-/commit/3505cdbf55d037ca144afbd117ff28… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 19:52:54 2023 -0600 joy: Remove size argument to set_config_key function. --- dlls/joy.cpl/main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 28334ec6f99..7d724be7280 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -123,7 +123,7 @@ static BOOL get_app_key(HKEY *defkey, HKEY *appkey) * set_config_key [internal] * Writes a string value to a registry key, deletes the key if value == NULL */ -static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const WCHAR *value, DWORD size) +static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const WCHAR *value) { if (value == NULL) { @@ -135,6 +135,8 @@ static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const W } else { + DWORD size = wcslen(value); + if (appkey && !RegSetValueExW(appkey, name, 0, REG_SZ, (const BYTE*) value, (size + 1)*sizeof(WCHAR))) return 0; @@ -157,9 +159,9 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) get_app_key(&hkey, &appkey); if (!enable) - set_config_key(hkey, appkey, joy_name, L"disabled", wcslen(L"disabled")); + set_config_key(hkey, appkey, joy_name, L"disabled"); else - set_config_key(hkey, appkey, joy_name, NULL, 0); + set_config_key(hkey, appkey, joy_name, NULL); if (hkey) RegCloseKey(hkey); if (appkey) RegCloseKey(appkey); @@ -230,9 +232,9 @@ static void override_joystick(WCHAR *joy_name, BOOL override) get_app_key(&hkey, &appkey); if (override) - set_config_key(hkey, appkey, joy_name, L"override", wcslen(L"override")); + set_config_key(hkey, appkey, joy_name, L"override"); else - set_config_key(hkey, appkey, joy_name, NULL, 0); + set_config_key(hkey, appkey, joy_name, NULL); if (hkey) RegCloseKey(hkey); if (appkey) RegCloseKey(appkey);

1 0

Paul Gofman : winex11.drv: Release old drawables after setting new ones in sync_context().
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: a743f085df51120a6baa0543d48ca5d1f915afcc URL: https://gitlab.winehq.org/wine/wine/-/commit/a743f085df51120a6baa0543d48ca5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 16 20:22:01 2023 -0600 winex11.drv: Release old drawables after setting new ones in sync_context(). --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aadc0b99cd1..c23df82c7b9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1201,18 +1201,19 @@ static void mark_drawable_dirty( struct gl_drawable *old, struct gl_drawable *ne static inline void sync_context(struct wgl_context *context) { BOOL refresh = FALSE; + struct gl_drawable *old[2] = { NULL }; pthread_mutex_lock( &context_mutex ); if (context->new_drawables[0]) { - release_gl_drawable( context->drawables[0] ); + old[0] = context->drawables[0]; context->drawables[0] = context->new_drawables[0]; context->new_drawables[0] = NULL; refresh = TRUE; } if (context->new_drawables[1]) { - release_gl_drawable( context->drawables[1] ); + old[1] = context->drawables[1]; context->drawables[1] = context->new_drawables[1]; context->new_drawables[1] = NULL; refresh = TRUE; @@ -1224,6 +1225,8 @@ static inline void sync_context(struct wgl_context *context) context->drawables[1]->drawable, context->ctx); else pglXMakeCurrent(gdi_display, context->drawables[0]->drawable, context->ctx); + release_gl_drawable( old[0] ); + release_gl_drawable( old[1] ); } pthread_mutex_unlock( &context_mutex ); }

1 0

Mohamad Al-Jaf : include: Add IStorageFolder interface definition.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: bf1b0d5f103c345fb1e289345ad4fcae61591e38 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf1b0d5f103c345fb1e289345ad4fc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jan 5 22:14:33 2023 -0500 include: Add IStorageFolder interface definition. --- include/windows.storage.idl | 82 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/include/windows.storage.idl b/include/windows.storage.idl index d46c7430b2b..717460a0817 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -32,6 +32,7 @@ import "windows.storage.streams.idl"; import "windows.system.idl"; namespace Windows.Storage { + typedef enum CreationCollisionOption CreationCollisionOption; typedef enum FileAccessMode FileAccessMode; typedef enum FileAttributes FileAttributes; typedef enum NameCollisionOption NameCollisionOption; @@ -50,12 +51,36 @@ namespace Windows.Storage { runtimeclass StorageStreamTransaction; declare { + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.IStorageItem *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFile *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFolder *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageStreamTransaction *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.IStorageItem *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageStreamTransaction *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum CreationCollisionOption + { + GenerateUniqueName = 0, + ReplaceExisting = 1, + FailIfExists = 2, + OpenIfExists = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -161,6 +186,52 @@ namespace Windows.Storage { HRESULT MoveAndReplaceAsync([in] Windows.Storage.IStorageFile *file, [out, retval] Windows.Foundation.IAsyncAction **operation); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(72d1cb78-b3ef-4f75-a80b-6fd9dae2944b) + ] + interface IStorageFolder : IInspectable + requires Windows.Storage.IStorageItem + { + [overload("CreateFileAsync")] + HRESULT CreateFileAsyncOverloadDefaultOptions( + [in] HSTRING name, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation + ); + [overload("CreateFileAsync")] + HRESULT CreateFileAsync( + [in] HSTRING name, + [in] Windows.Storage.CreationCollisionOption options, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation + ); + [overload("CreateFolderAsync")] + HRESULT CreateFolderAsyncOverloadDefaultOptions( + [in] HSTRING name, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation + ); + [overload("CreateFolderAsync")] + HRESULT CreateFolderAsync( + [in] HSTRING name, + [in] Windows.Storage.CreationCollisionOption options, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation + ); + HRESULT GetFileAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *> **operation); + HRESULT GetFolderAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation); + HRESULT GetItemAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.IStorageItem *> **operation); + [overload("GetFilesAsync")] + HRESULT GetFilesAsyncOverloadDefaultOptionsStartAndCount( + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *> **operation + ); + [overload("GetFoldersAsync")] + HRESULT GetFoldersAsyncOverloadDefaultOptionsStartAndCount( + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *> **operation + ); + [overload("GetItemsAsync")] + HRESULT GetItemsAsyncOverloadDefaultStartAndCount( + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *> **operation + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(4207a996-ca2f-42f7-bde8-8b10457a7f30) @@ -216,11 +287,20 @@ namespace Windows.Storage { [ contract(Windows.Foundation.UniversalApiContract, 1.0), - static(Windows.Storage.IStorageFolderStatics, Windows.Foundation.UniversalApiContract, 1.0) + static(Windows.Storage.IStorageFolderStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IStorageFolderStatics2, Windows.Foundation.UniversalApiContract, 10.0) ] runtimeclass StorageFolder { [default] interface Windows.Storage.IStorageFolder; + interface Windows.Storage.IStorageItem; + interface Windows.Storage.Search.IStorageFolderQueryOperations; + 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.IStorageFolder2; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Storage.IStorageFolder3; } [

1 0

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

Aug. 17, 2023

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 Aug. 17, 2023

Aug. 17, 2023

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 Aug. 17, 2023

Aug. 17, 2023

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

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

Aug. 17, 2023

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 Aug. 17, 2023

Aug. 17, 2023

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