- Wine-Commits - list.winehq.org

Eric Pouech : ntdll/tests: Add tests for debuggee and new Win10 unicode debug strings.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 514f63f3b5b56f8437ae5ed85fa4a81220477093 URL: https://gitlab.winehq.org/wine/wine/-/commit/514f63f3b5b56f8437ae5ed85fa4a8… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Aug 17 15:49:51 2023 +0200 ntdll/tests: Add tests for debuggee and new Win10 unicode debug strings. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 188 +++++++++++++++++++++++++++++++++---------- 1 file changed, 144 insertions(+), 44 deletions(-)

1 0

Eric Pouech : ntdll/tests: Introduce enumeration to handle stages in test_debugger().
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 33db5b78bc7357251172411c93bb13d4359e2f1a URL: https://gitlab.winehq.org/wine/wine/-/commit/33db5b78bc7357251172411c93bb13… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Aug 17 15:49:51 2023 +0200 ntdll/tests: Introduce enumeration to handle stages in test_debugger(). It'll be easier to add stages. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 211 ++++++++++++++++++++++++------------------- 1 file changed, 116 insertions(+), 95 deletions(-)

1 0

Davide Beatrici : winepulse: Fix crash when requesting exclusive mode with an unsupported format.
by Alexandre Julliard Aug. 22, 2023

Aug. 22, 2023

Module: wine Branch: master Commit: 31e5218286f0686304b8aaa62b626dcfd9b202c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/31e5218286f0686304b8aaa62b626d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Aug 21 13:11:46 2023 +0200 winepulse: Fix crash when requesting exclusive mode with an unsupported format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55362 --- dlls/winepulse.drv/pulse.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 0e587033a6d..370c361b02f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2221,9 +2221,14 @@ static NTSTATUS pulse_is_format_supported(void *args) break; } - /* This driver does not support exclusive mode. */ - if (exclusive && params->result == S_OK) - params->result = params->flow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; + if (exclusive) { /* This driver does not support exclusive mode. */ + if (params->result == S_OK) + params->result = params->flow == eCapture ? + AUDCLNT_E_UNSUPPORTED_FORMAT : + AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; + else if (params->result == S_FALSE) + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + } return STATUS_SUCCESS; }

1 0

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