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

Bartosz Kosiorek : gdiplus: Add support for GdipPathIterNextPathType.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 797a8bb192d49a44b8cec468e3421444feb03f8a URL: https://gitlab.winehq.org/wine/wine/-/commit/797a8bb192d49a44b8cec468e34214… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Aug 20 01:05:32 2023 +0200 gdiplus: Add support for GdipPathIterNextPathType. --- dlls/gdiplus/pathiterator.c | 33 ++++- dlls/gdiplus/tests/pathiterator.c | 278 ++++++++++++++++++++++++++++++++++---- 2 files changed, 282 insertions(+), 29 deletions(-)

1 0

Bartosz Kosiorek : gdiplus: Improve performance by switching loops and fix size.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 27989a0a3a4fe1f28b55932519afb387b4ce1dcb URL: https://gitlab.winehq.org/wine/wine/-/commit/27989a0a3a4fe1f28b55932519afb3… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Aug 20 02:04:59 2023 +0200 gdiplus: Improve performance by switching loops and fix size. --- dlls/gdiplus/graphics.c | 20 ++++++++++---------- dlls/gdiplus/image.c | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e3b5661fd67..65b33cdc960 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -771,8 +771,8 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d max_green = (key->high>>8)&0xff; max_red = (key->high>>16)&0xff; - for (x=0; x<width; x++) - for (y=0; y<height; y++) + for (y=0; y<height; y++) + for (x=0; x<width; x++) { ARGB *src_color; BYTE blue, green, red; @@ -799,8 +799,8 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d else table = &attributes->colorremaptables[ColorAdjustTypeDefault]; - for (x=0; x<width; x++) - for (y=0; y<height; y++) + for (y=0; y<height; y++) + for (x=0; x<width; x++) { ARGB *src_color; src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); @@ -838,9 +838,9 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d if (!identity) { - for (x=0; x<width; x++) + for (y=0; y<height; y++) { - for (y=0; y<height; y++) + for (x=0; x<width; x++) { ARGB *src_color; src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); @@ -872,8 +872,8 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d else gamma = attributes->gamma[ColorAdjustTypeDefault]; - for (x=0; x<width; x++) - for (y=0; y<height; y++) + for (y=0; y<height; y++) + for (x=0; x<width; x++) { ARGB *src_color; BYTE blue, green, red; @@ -1201,8 +1201,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, { int x, y; GpSolidFill *fill = (GpSolidFill*)brush; - for (x=0; x<fill_area->Width; x++) - for (y=0; y<fill_area->Height; y++) + for (y=0; y<fill_area->Height; y++) + for (x=0; x<fill_area->Width; x++) argb_pixels[x + y*cdwStride] = fill->color; return Ok; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3dfc2fec763..1aa5f59a4e7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1693,8 +1693,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) /* If any pixel has a non-zero alpha, ignore hbmMask */ src = (DWORD*)lockeddata.Scan0; - for (x=0; x<width && !has_alpha; x++) - for (y=0; y<height && !has_alpha; y++) + for (y=0; y<height && !has_alpha; y++) + for (x=0; x<width && !has_alpha; x++) if ((*src++ & 0xff000000) != 0) has_alpha = TRUE; } @@ -1723,7 +1723,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) for (y=0; y<height; y++) { dst = (DWORD*)dst_row; - for (x=0; x<height; x++) + for (x=0; x<width; x++) { DWORD src_value = *src++; if (src_value) @@ -1743,7 +1743,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) for (y=0; y<height; y++) { dst = (DWORD*)dst_row; - for (x=0; x<height; x++) + for (x=0; x<width; x++) *dst++ |= 0xff000000; dst_row += lockeddata.Stride; }

1 0

Etaash Mathamsetty : ntdll: Add semi-stub for NtOpenKeyTransactedEx.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 948412f0fe991c446b8915ab8f261be0520eead5 URL: https://gitlab.winehq.org/wine/wine/-/commit/948412f0fe991c446b8915ab8f261b… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Wed Aug 2 18:59:33 2023 -0400 ntdll: Add semi-stub for NtOpenKeyTransactedEx. --- dlls/ntdll/unix/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index a24d6e7c267..3646d32c0a6 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -176,8 +176,8 @@ NTSTATUS WINAPI NtOpenKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBU NTSTATUS WINAPI NtOpenKeyTransactedEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options, HANDLE transaction ) { - FIXME( "(%p %x %p %x %p)\n", key, (int)access, attr, (int)options, transaction ); - return STATUS_NOT_IMPLEMENTED; + FIXME( "(%p %x %p %x %p) semi-stub\n", key, (int)access, attr, (int)options, transaction ); + return NtOpenKeyEx( key, access, attr, options ); }

1 0

Biswapriyo Nath : include: Add KnownFolders runtimeclass in windows.storage.idl.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 148ff982dcd73a6fa61d646ae6671c657dc2fa79 URL: https://gitlab.winehq.org/wine/wine/-/commit/148ff982dcd73a6fa61d646ae6671c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Aug 21 18:29:18 2023 +0530 include: Add KnownFolders runtimeclass in windows.storage.idl. --- include/windows.storage.idl | 162 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/include/windows.storage.idl b/include/windows.storage.idl index 717460a0817..debd0f2a03a 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -35,10 +35,19 @@ namespace Windows.Storage { typedef enum CreationCollisionOption CreationCollisionOption; typedef enum FileAccessMode FileAccessMode; typedef enum FileAttributes FileAttributes; + typedef enum KnownFolderId KnownFolderId; + typedef enum KnownFoldersAccessStatus KnownFoldersAccessStatus; typedef enum NameCollisionOption NameCollisionOption; typedef enum StorageDeleteOption StorageDeleteOption; typedef enum StorageItemTypes StorageItemTypes; + interface IKnownFoldersCameraRollStatics; + interface IKnownFoldersPlaylistsStatics; + interface IKnownFoldersSavedPicturesStatics; + interface IKnownFoldersStatics; + interface IKnownFoldersStatics2; + interface IKnownFoldersStatics3; + interface IKnownFoldersStatics4; interface IStorageFolder; interface IStorageFolderStatics; interface IStorageFolderStatics2; @@ -46,6 +55,7 @@ namespace Windows.Storage { interface IStorageFileStatics2; interface IStorageItem; + runtimeclass KnownFolders; runtimeclass StorageFolder; runtimeclass StorageFile; runtimeclass StorageStreamTransaction; @@ -57,6 +67,7 @@ namespace Windows.Storage { 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.KnownFoldersAccessStatus>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.IStorageItem *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFile *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFolder *>; @@ -64,6 +75,7 @@ namespace Windows.Storage { 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.KnownFoldersAccessStatus>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.IStorageItem *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *>; @@ -105,6 +117,47 @@ namespace Windows.Storage { LocallyIncomplete = 0x200, }; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum KnownFolderId + { + AppCaptures = 0, + CameraRoll = 1, + DocumentsLibrary = 2, + HomeGroup = 3, + MediaServerDevices = 4, + MusicLibrary = 5, + Objects3D = 6, + PicturesLibrary = 7, + Playlists = 8, + RecordedCalls = 9, + RemovableDevices = 10, + SavedPictures = 11, + Screenshots = 12, + VideosLibrary = 13, + [contract(Windows.Foundation.UniversalApiContract, 4.0)] + AllAppMods = 14, + [contract(Windows.Foundation.UniversalApiContract, 4.0)] + CurrentAppMods = 15, + [contract(Windows.Foundation.UniversalApiContract, 11.0)] + DownloadsFolder = 16, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 10.0) + ] + enum KnownFoldersAccessStatus + { + DeniedBySystem = 0, + NotDeclaredByApp = 1, + DeniedByUser = 2, + UserPromptRequired = 3, + Allowed = 4, + [contract(Windows.Foundation.UniversalApiContract, 11.0)] + AllowedPerAppFolder = 5, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -135,6 +188,100 @@ namespace Windows.Storage { Folder = 0x2, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(5d115e66-27e8-492f-b8e5-2f90896cd4cd) + ] + interface IKnownFoldersCameraRollStatics : IInspectable + { + [propget] HRESULT CameraRoll([out, retval] Windows.Storage.StorageFolder **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(dad5ecd6-306f-4d6a-b496-46ba8eb106ce) + ] + interface IKnownFoldersPlaylistsStatics : IInspectable + { + [propget] HRESULT Playlists([out, retval] Windows.Storage.StorageFolder **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(055c93ea-253d-467c-b6ca-a97da1e9a18d) + ] + interface IKnownFoldersSavedPicturesStatics : IInspectable + { + [propget] HRESULT SavedPictures([out, retval] Windows.Storage.StorageFolder **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(5a2a7520-4802-452d-9ad9-4351ada7ec35) + ] + interface IKnownFoldersStatics : IInspectable + { + [propget] HRESULT MusicLibrary([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT PicturesLibrary([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT VideosLibrary([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT DocumentsLibrary([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT HomeGroup([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT RemovableDevices([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT MediaServerDevices([out, retval] Windows.Storage.StorageFolder **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(194bd0cd-cf6e-4d07-9d53-e9163a2536e9) + ] + interface IKnownFoldersStatics2 : IInspectable + { + [propget] HRESULT Objects3D([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT AppCaptures([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT RecordedCalls([out, retval] Windows.Storage.StorageFolder **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(c5194341-9742-4ed5-823d-fc1401148764) + ] + interface IKnownFoldersStatics3 : IInspectable + { + HRESULT GetFolderForUserAsync( + [in] Windows.System.User *user, + [in] Windows.Storage.KnownFolderId folder_id, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 10.0), + exclusiveto(Windows.Storage.KnownFolders), + uuid(1722e6bf-9ff9-4b21-bed5-90ecb13a192e) + ] + interface IKnownFoldersStatics4 : IInspectable + { + HRESULT RequestAccessAsync( + [in] Windows.Storage.KnownFolderId folder_id, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.KnownFoldersAccessStatus> **operation + ); + HRESULT RequestAccessForUserAsync( + [in] Windows.System.User *user, + [in] Windows.Storage.KnownFolderId folder_id, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.KnownFoldersAccessStatus> **operation + ); + HRESULT GetFolderAsync( + [in] Windows.Storage.KnownFolderId folder_id, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(fa3f6186-4214-428c-a64c-14c9ac7315ea) @@ -266,6 +413,21 @@ namespace Windows.Storage { HRESULT CommitAsync([out, retval] Windows.Foundation.IAsyncAction **operation); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Storage.IKnownFoldersCameraRollStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IKnownFoldersPlaylistsStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IKnownFoldersSavedPicturesStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IKnownFoldersStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IKnownFoldersStatics2, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Storage.IKnownFoldersStatics3, Windows.Foundation.UniversalApiContract, 2.0), + static(Windows.Storage.IKnownFoldersStatics4, Windows.Foundation.UniversalApiContract, 10.0) + ] + runtimeclass KnownFolders + { + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), static(Windows.Storage.IStorageFileStatics, Windows.Foundation.UniversalApiContract, 1.0),

1 0

Biswapriyo Nath : include: Add ApplicationData runtimeclass in windows.storage.idl.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 9227d8abff6cf78f7fa7da7023aead43cd0a339e URL: https://gitlab.winehq.org/wine/wine/-/commit/9227d8abff6cf78f7fa7da7023aead… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Aug 21 18:29:26 2023 +0530 include: Add ApplicationData runtimeclass in windows.storage.idl. --- include/windows.storage.idl | 220 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+)

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLStyleSheetRule.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 56ced91b8e9f9ae5c8ea29bf44715a8fd3ffc964 URL: https://gitlab.winehq.org/wine/wine/-/commit/56ced91b8e9f9ae5c8ea29bf44715a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 21 16:41:50 2023 +0300 mshtml: Implement Cycle Collection for HTMLStyleSheetRule. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstylesheet.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 161ca6c3252..49b0053bdce 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -66,8 +66,6 @@ struct HTMLStyleSheetRule { DispatchEx dispex; IHTMLStyleSheetRule IHTMLStyleSheetRule_iface; - LONG ref; - nsIDOMCSSRule *nsstylesheetrule; }; @@ -87,7 +85,7 @@ static HRESULT WINAPI HTMLStyleSheetRule_QueryInterface(IHTMLStyleSheetRule *ifa *ppv = &This->IHTMLStyleSheetRule_iface; else if (IsEqualGUID(&IID_IHTMLStyleSheetRule, riid)) *ppv = &This->IHTMLStyleSheetRule_iface; - else if (dispex_query_interface_no_cc(&This->dispex, riid, ppv)) + else if (dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; else { @@ -103,7 +101,7 @@ static HRESULT WINAPI HTMLStyleSheetRule_QueryInterface(IHTMLStyleSheetRule *ifa static ULONG WINAPI HTMLStyleSheetRule_AddRef(IHTMLStyleSheetRule *iface) { HTMLStyleSheetRule *This = impl_from_IHTMLStyleSheetRule(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -113,13 +111,10 @@ static ULONG WINAPI HTMLStyleSheetRule_AddRef(IHTMLStyleSheetRule *iface) static ULONG WINAPI HTMLStyleSheetRule_Release(IHTMLStyleSheetRule *iface) { HTMLStyleSheetRule *This = impl_from_IHTMLStyleSheetRule(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = dispex_ref_decr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) - release_dispex(&This->dispex); - return ref; } @@ -201,6 +196,13 @@ static inline HTMLStyleSheetRule *HTMLStyleSheetRule_from_DispatchEx(DispatchEx return CONTAINING_RECORD(iface, HTMLStyleSheetRule, dispex); } +static void HTMLStyleSheetRule_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLStyleSheetRule *This = HTMLStyleSheetRule_from_DispatchEx(dispex); + if(This->nsstylesheetrule) + note_cc_edge((nsISupports*)This->nsstylesheetrule, "nsstylesheetrule", cb); +} + static void HTMLStyleSheetRule_unlink(DispatchEx *dispex) { HTMLStyleSheetRule *This = HTMLStyleSheetRule_from_DispatchEx(dispex); @@ -215,6 +217,7 @@ static void HTMLStyleSheetRule_destructor(DispatchEx *dispex) static const dispex_static_data_vtbl_t HTMLStyleSheetRule_dispex_vtbl = { .destructor = HTMLStyleSheetRule_destructor, + .traverse = HTMLStyleSheetRule_traverse, .unlink = HTMLStyleSheetRule_unlink }; @@ -239,7 +242,6 @@ static HRESULT create_style_sheet_rule(nsIDOMCSSRule *nsstylesheetrule, compat_m return E_OUTOFMEMORY; rule->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl; - rule->ref = 1; rule->nsstylesheetrule = NULL; init_dispatch(&rule->dispex, (IUnknown *)&rule->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex,

1 0

Biswapriyo Nath : include: Add IRandomAccessStream generic types in windows.storage.streams.idl.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 1326f5302512337c29843e4e3cdd3a9ffd96c956 URL: https://gitlab.winehq.org/wine/wine/-/commit/1326f5302512337c29843e4e3cdd3a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Aug 21 18:29:35 2023 +0530 include: Add IRandomAccessStream generic types in windows.storage.streams.idl. This fixes the following error. windows.storage.h:3992:9: error: unknown type name '__FIAsyncOperation_1_Windows__CStorage__CStreams__CIRandomAccessStream' --- include/windows.storage.streams.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index bcbdf588ec6..5bdeb3689ff 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -37,8 +37,13 @@ namespace Windows.Storage.Streams { interface IRandomAccessStreamStatics; interface IRandomAccessStreamWithContentType; runtimeclass Buffer; + runtimeclass RandomAccessStream; declare { + interface Windows.Foundation.Collections.IIterable<Windows.Storage.Streams.IRandomAccessStream *>; + interface Windows.Foundation.Collections.IIterator<Windows.Storage.Streams.IRandomAccessStream *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Storage.Streams.IRandomAccessStream *>; + interface Windows.Foundation.Collections.IVector<Windows.Storage.Streams.IRandomAccessStream *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IBuffer *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IRandomAccessStream *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *>;

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLStyleSheetsCollection.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 99d968c0e411d0cea8ae29b2302e5f58d5a24b60 URL: https://gitlab.winehq.org/wine/wine/-/commit/99d968c0e411d0cea8ae29b2302e5f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 21 16:41:50 2023 +0300 mshtml: Implement Cycle Collection for HTMLStyleSheetsCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstylesheet.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 72f7e2fde29..f7d70f793ca 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -43,8 +43,6 @@ struct HTMLStyleSheetsCollection { DispatchEx dispex; IHTMLStyleSheetsCollection IHTMLStyleSheetsCollection_iface; - LONG ref; - nsIDOMStyleSheetList *nslist; }; @@ -671,7 +669,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { *ppv = &This->IHTMLStyleSheetsCollection_iface; - }else if(dispex_query_interface_no_cc(&This->dispex, riid, ppv)) { + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; @@ -686,7 +684,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection *iface) { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -696,13 +694,10 @@ static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection static ULONG WINAPI HTMLStyleSheetsCollection_Release(IHTMLStyleSheetsCollection *iface) { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = dispex_ref_decr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) - release_dispex(&This->dispex); - return ref; } @@ -837,6 +832,13 @@ static inline HTMLStyleSheetsCollection *HTMLStyleSheetsCollection_from_Dispatch return CONTAINING_RECORD(iface, HTMLStyleSheetsCollection, dispex); } +static void HTMLStyleSheetsCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLStyleSheetsCollection *This = HTMLStyleSheetsCollection_from_DispatchEx(dispex); + if(This->nslist) + note_cc_edge((nsISupports*)This->nslist, "nslist", cb); +} + static void HTMLStyleSheetsCollection_unlink(DispatchEx *dispex) { HTMLStyleSheetsCollection *This = HTMLStyleSheetsCollection_from_DispatchEx(dispex); @@ -927,6 +929,7 @@ static HRESULT HTMLStyleSheetsCollection_invoke(DispatchEx *dispex, DISPID id, L static const dispex_static_data_vtbl_t HTMLStyleSheetsCollection_dispex_vtbl = { .destructor = HTMLStyleSheetsCollection_destructor, + .traverse = HTMLStyleSheetsCollection_traverse, .unlink = HTMLStyleSheetsCollection_unlink, .get_dispid = HTMLStyleSheetsCollection_get_dispid, .get_name = HTMLStyleSheetsCollection_get_name, @@ -952,7 +955,6 @@ HRESULT create_style_sheet_collection(nsIDOMStyleSheetList *nslist, compat_mode_ return E_OUTOFMEMORY; collection->IHTMLStyleSheetsCollection_iface.lpVtbl = &HTMLStyleSheetsCollectionVtbl; - collection->ref = 1; if(nslist) nsIDOMStyleSheetList_AddRef(nslist);

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLCSSStyleDeclaration.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 4ee59922fe4ec13b6fd3ef1bb4fd339dcf1c8ec4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ee59922fe4ec13b6fd3ef1bb4fd33… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 21 16:41:50 2023 +0300 mshtml: Implement Cycle Collection for HTMLCSSStyleDeclaration. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstyle.c | 18 +++++++++++------- dlls/mshtml/htmlstyle.h | 2 -- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index dca910fd0f7..ac786326a0f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4743,7 +4743,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_QueryInterface(IHTMLCSSStyleDeclar *ppv = &This->IHTMLCSSStyleDeclaration_iface; }else if(IsEqualGUID(&IID_IHTMLCSSStyleDeclaration2, riid)) { *ppv = &This->IHTMLCSSStyleDeclaration2_iface; - }else if(dispex_query_interface_no_cc(&This->dispex, riid, ppv)) { + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else if(!This->qi || !(*ppv = This->qi(This, riid))) { *ppv = NULL; @@ -4758,7 +4758,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_QueryInterface(IHTMLCSSStyleDeclar static ULONG WINAPI HTMLCSSStyleDeclaration_AddRef(IHTMLCSSStyleDeclaration *iface) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -4768,13 +4768,10 @@ static ULONG WINAPI HTMLCSSStyleDeclaration_AddRef(IHTMLCSSStyleDeclaration *ifa static ULONG WINAPI HTMLCSSStyleDeclaration_Release(IHTMLCSSStyleDeclaration *iface) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = dispex_ref_decr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) - release_dispex(&This->dispex); - return ref; } @@ -9965,6 +9962,13 @@ static inline CSSStyle *impl_from_DispatchEx(DispatchEx *dispex) return CONTAINING_RECORD(dispex, CSSStyle, dispex); } +static void CSSStyle_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + CSSStyle *This = impl_from_DispatchEx(dispex); + if(This->nsstyle) + note_cc_edge((nsISupports*)This->nsstyle, "nsstyle", cb); +} + static void CSSStyle_unlink(DispatchEx *dispex) { CSSStyle *This = impl_from_DispatchEx(dispex); @@ -10006,6 +10010,7 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { .destructor = CSSStyle_destructor, + .traverse = CSSStyle_traverse, .unlink = CSSStyle_unlink, .get_dispid = CSSStyle_get_dispid, }; @@ -10070,7 +10075,6 @@ void init_css_style(CSSStyle *style, nsIDOMCSSStyleDeclaration *nsstyle, style_q { style->IHTMLCSSStyleDeclaration_iface.lpVtbl = &HTMLCSSStyleDeclarationVtbl; style->IHTMLCSSStyleDeclaration2_iface.lpVtbl = &HTMLCSSStyleDeclaration2Vtbl; - style->ref = 1; style->qi = qi; style->nsstyle = nsstyle; nsIDOMCSSStyleDeclaration_AddRef(nsstyle); diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 73d54128120..caae7d6ffa0 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -23,8 +23,6 @@ struct CSSStyle { DispatchEx dispex; IHTMLCSSStyleDeclaration IHTMLCSSStyleDeclaration_iface; IHTMLCSSStyleDeclaration2 IHTMLCSSStyleDeclaration2_iface; - - LONG ref; style_qi_t qi; nsIDOMCSSStyleDeclaration *nsstyle;

1 0

Gabriel Ivăncescu : mshtml: Implement Cycle Collection for HTMLAttributeCollection.
by Alexandre Julliard Aug. 21, 2023

Aug. 21, 2023

Module: wine Branch: master Commit: 2ee74c592ba19776e961f6f6f975ef7c4324a1fd URL: https://gitlab.winehq.org/wine/wine/-/commit/2ee74c592ba19776e961f6f6f975ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 21 16:41:50 2023 +0300 mshtml: Implement Cycle Collection for HTMLAttributeCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 21 ++++++++++++++------- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7111dbd92a0..b557630a51a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8549,7 +8549,7 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle *ppv = &This->IHTMLAttributeCollection2_iface; }else if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) { *ppv = &This->IHTMLAttributeCollection3_iface; - }else if(dispex_query_interface_no_cc(&This->dispex, riid, ppv)) { + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; @@ -8564,7 +8564,7 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle static ULONG WINAPI HTMLAttributeCollection_AddRef(IHTMLAttributeCollection *iface) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = dispex_ref_incr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); @@ -8574,13 +8574,10 @@ static ULONG WINAPI HTMLAttributeCollection_AddRef(IHTMLAttributeCollection *ifa static ULONG WINAPI HTMLAttributeCollection_Release(IHTMLAttributeCollection *iface) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = dispex_ref_decr(&This->dispex); TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) - release_dispex(&This->dispex); - return ref; } @@ -8928,6 +8925,15 @@ static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); } +static void HTMLAttributeCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + HTMLDOMAttribute *attr; + + LIST_FOR_EACH_ENTRY(attr, &This->attrs, HTMLDOMAttribute, entry) + note_cc_edge((nsISupports*)&attr->IHTMLDOMAttribute_iface, "attr", cb); +} + static void HTMLAttributeCollection_unlink(DispatchEx *dispex) { HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); @@ -9013,6 +9019,7 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { .destructor = HTMLAttributeCollection_destructor, + .traverse = HTMLAttributeCollection_traverse, .unlink = HTMLAttributeCollection_unlink, .get_dispid = HTMLAttributeCollection_get_dispid, .get_name = HTMLAttributeCollection_get_name, @@ -9050,7 +9057,6 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a This->attrs->IHTMLAttributeCollection_iface.lpVtbl = &HTMLAttributeCollectionVtbl; This->attrs->IHTMLAttributeCollection2_iface.lpVtbl = &HTMLAttributeCollection2Vtbl; This->attrs->IHTMLAttributeCollection3_iface.lpVtbl = &HTMLAttributeCollection3Vtbl; - This->attrs->ref = 2; This->attrs->elem = This; list_init(&This->attrs->attrs); @@ -9058,5 +9064,6 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a &HTMLAttributeCollection_dispex, dispex_compat_mode(&iface->event_target.dispex)); *ac = This->attrs; + IHTMLAttributeCollection_AddRef(&This->attrs->IHTMLAttributeCollection_iface); return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7054ef8ac75..54c1e2cc338 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1160,8 +1160,6 @@ struct HTMLAttributeCollection { IHTMLAttributeCollection2 IHTMLAttributeCollection2_iface; IHTMLAttributeCollection3 IHTMLAttributeCollection3_iface; - LONG ref; - HTMLElement *elem; struct list attrs; };

1 0