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

Etaash Mathamsetty : ntdll: Allow NULL timeout in NtCreateNamedPipeFile.
by Alexandre Julliard 21 Aug '23

21 Aug '23

Module: wine Branch: master Commit: 4d6d580b66668f428979f88941203c1cdb96f99a URL: https://gitlab.winehq.org/wine/wine/-/commit/4d6d580b66668f428979f88941203c… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Mon Aug 7 13:44:44 2023 -0400 ntdll: Allow NULL timeout in NtCreateNamedPipeFile. --- dlls/ntdll/tests/om.c | 10 ++++++++++ dlls/ntdll/unix/file.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c03b5e4cfca..a67c987a8c2 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -412,6 +412,16 @@ static void test_name_collisions(void) ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); + memset( &iosb, 0xcc, sizeof(iosb) ); + status = pNtCreateNamedPipeFile( &h1, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, + FALSE, FALSE, FALSE, 10, 256, 256, NULL ); + ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); + ok( iosb.Status == STATUS_SUCCESS, "wrong status %08lx\n", status); + ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); + pNtClose(h1); + h1 = CreateNamedPipeA( "\\\\.\\pipe\\named_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, 10, 256, 256, 1000, NULL ); winerr = GetLastError(); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3a24d4ebbf2..43bde14e5d8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4132,7 +4132,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR (int)inbound_quota, (int)outbound_quota, timeout ); /* assume we only get relative timeout */ - if (timeout->QuadPart > 0) FIXME( "Wrong time %s\n", wine_dbgstr_longlong(timeout->QuadPart) ); + if (timeout && timeout->QuadPart > 0) FIXME( "Wrong time %s\n", wine_dbgstr_longlong(timeout->QuadPart) ); if ((status = alloc_object_attributes( attr, &objattr, &len ))) return status; @@ -4149,7 +4149,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR req->maxinstances = max_inst; req->outsize = outbound_quota; req->insize = inbound_quota; - req->timeout = timeout->QuadPart; + req->timeout = timeout ? timeout->QuadPart : 0ULL; wine_server_add_data( req, objattr, len ); if (!(status = wine_server_call( req ))) {

1 0

Alex Henrie : shell32: Use CRT allocation functions.
by Alexandre Julliard 21 Aug '23

21 Aug '23

Module: wine Branch: master Commit: 7df4a81ff2fa4d22a55dd4c2192ef4f3053a87fe URL: https://gitlab.winehq.org/wine/wine/-/commit/7df4a81ff2fa4d22a55dd4c2192ef4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 20 17:10:47 2023 -0600 shell32: Use CRT allocation functions. --- dlls/shell32/assoc.c | 36 +++++++-------- dlls/shell32/autocomplete.c | 48 ++++++++++---------- dlls/shell32/brsfolder.c | 12 ++--- dlls/shell32/control.c | 27 ++++++------ dlls/shell32/dataobject.c | 8 ++-- dlls/shell32/dialogs.c | 32 ++++++-------- dlls/shell32/ebrowser.c | 14 +++--- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/folders.c | 12 ++--- dlls/shell32/iconcache.c | 27 ++++++------ dlls/shell32/pidl.c | 4 +- dlls/shell32/recyclebin.c | 46 +++++++++---------- dlls/shell32/shell32_main.c | 26 +++++------ dlls/shell32/shellitem.c | 34 +++++++------- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shellord.c | 16 +++---- dlls/shell32/shellpath.c | 74 +++++++++++++++---------------- dlls/shell32/shfldr_fs.c | 8 ++-- dlls/shell32/shfldr_netplaces.c | 4 +- dlls/shell32/shlexec.c | 98 ++++++++++++++++++++--------------------- dlls/shell32/shlfileop.c | 53 +++++++++++----------- dlls/shell32/shlfsbind.c | 6 +-- dlls/shell32/shlmenu.c | 28 ++++++------ dlls/shell32/shlview.c | 8 ++-- dlls/shell32/shlview_cmenu.c | 17 ++++--- dlls/shell32/systray.c | 5 +-- 26 files changed, 319 insertions(+), 330 deletions(-)

1 0

Alex Henrie : xaudio2_7: Use CRT allocation functions.
by Alexandre Julliard 21 Aug '23

21 Aug '23

Module: wine Branch: master Commit: 4021336223edd953db1ce8e51a5f2e6de8f57d84 URL: https://gitlab.winehq.org/wine/wine/-/commit/4021336223edd953db1ce8e51a5f2e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 22:40:16 2023 -0600 xaudio2_7: Use CRT allocation functions. --- dlls/xaudio2_7/xapo.c | 11 +++++------ dlls/xaudio2_7/xaudio_dll.c | 33 ++++++++++++++++----------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 070d0592307..9a58108cb89 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -26,7 +26,6 @@ #include "xapofx.h" #include "wine/debug.h" -#include "wine/heap.h" #include <FAPO.h> #include <FAPOFX.h> @@ -84,7 +83,7 @@ static ULONG WINAPI XAPOFX_Release(IXAPO *iface) TRACE("(%p)->(): Refcount now %lu\n", This, ref); if(!ref) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -258,7 +257,7 @@ static HRESULT xapo_create(FAPO *fapo, XA2XAPOFXImpl **out) { XA2XAPOFXImpl *object; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = malloc(sizeof(*object)))) return E_OUTOFMEMORY; object->IXAPO_iface.lpVtbl = &XAPOFX_Vtbl; @@ -345,7 +344,7 @@ static ULONG WINAPI xapocf_Release(IClassFactory *iface) ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Refcount now %lu\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -425,13 +424,13 @@ static const IClassFactoryVtbl xapo_Vtbl = HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) { HRESULT hr; - struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); + struct xapo_cf *ret = malloc(sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; ret->class = clsid; ret->ref = 0; hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); if(FAILED(hr)) - HeapFree(GetProcessHeap(), 0, ret); + free(ret); return hr; } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 237573e6741..b821e9667b7 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -34,7 +34,6 @@ #include "wine/asm.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); @@ -114,7 +113,7 @@ static int32_t FAPOCALL XAPO_Release(void *iface) IXAPO_Release(This->xapo); if(This->xapo_params) IXAPOParameters_Release(This->xapo_params); - heap_free(This); + free(This); } return r; } @@ -290,7 +289,7 @@ static XA2XAPOImpl *wrap_xapo(IUnknown *unk) xapo_params = NULL; } - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); ret->xapo = xapo; ret->xapo_params = xapo_params; @@ -310,7 +309,7 @@ FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) if(!pEffectChain) return NULL; - ret = heap_alloc(sizeof(*ret) + sizeof(FAudioEffectDescriptor) * pEffectChain->EffectCount); + ret = malloc(sizeof(*ret) + sizeof(FAudioEffectDescriptor) * pEffectChain->EffectCount); ret->EffectCount = pEffectChain->EffectCount; ret->pEffectDescriptors = (void*)(ret + 1); @@ -331,7 +330,7 @@ static void free_effect_chain(FAudioEffectChain *chain) return; for(i = 0; i < chain->EffectCount; ++i) XAPO_Release(chain->pEffectDescriptors[i].pEffect); - heap_free(chain); + free(chain); } /* Send Wrapping */ @@ -345,7 +344,7 @@ static FAudioVoiceSends *wrap_voice_sends(const XAUDIO2_VOICE_SENDS *sends) return NULL; #if XAUDIO2_VER <= 3 - ret = heap_alloc(sizeof(*ret) + sends->OutputCount * sizeof(FAudioSendDescriptor)); + ret = malloc(sizeof(*ret) + sends->OutputCount * sizeof(FAudioSendDescriptor)); ret->SendCount = sends->OutputCount; ret->pSends = (FAudioSendDescriptor*)(ret + 1); for(i = 0; i < sends->OutputCount; ++i){ @@ -354,7 +353,7 @@ static FAudioVoiceSends *wrap_voice_sends(const XAUDIO2_VOICE_SENDS *sends) ret->pSends[i].Flags = 0; } #else - ret = heap_alloc(sizeof(*ret) + sends->SendCount * sizeof(FAudioSendDescriptor)); + ret = malloc(sizeof(*ret) + sends->SendCount * sizeof(FAudioSendDescriptor)); ret->SendCount = sends->SendCount; ret->pSends = (FAudioSendDescriptor*)(ret + 1); for(i = 0; i < sends->SendCount; ++i){ @@ -370,7 +369,7 @@ static void free_voice_sends(FAudioVoiceSends *sends) { if(!sends) return; - heap_free(sends); + free(sends); } /* Voice Callbacks */ @@ -1453,15 +1452,15 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) LIST_FOR_EACH_ENTRY_SAFE(v, v2, &This->voices, XA2VoiceImpl, entry){ v->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&v->lock); - HeapFree(GetProcessHeap(), 0, v); + free(v); } - HeapFree(GetProcessHeap(), 0, This->cbs); + free(This->cbs); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; } @@ -1515,7 +1514,7 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, } This->ncbs++; - This->cbs = heap_realloc(This->cbs, This->ncbs * sizeof(*This->cbs)); + This->cbs = realloc(This->cbs, This->ncbs * sizeof(*This->cbs)); This->cbs[i] = pCallback; @@ -1557,7 +1556,7 @@ static inline XA2VoiceImpl *create_voice(IXAudio2Impl *This) { XA2VoiceImpl *voice; - voice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*voice)); + voice = calloc(1, sizeof(*voice)); if(!voice) return NULL; @@ -1872,7 +1871,7 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Refcount now %lu\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -1890,7 +1889,7 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p if(pOuter) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -1949,12 +1948,12 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = static inline HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { HRESULT hr; - struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); + struct xaudio2_cf *ret = malloc(sizeof(struct xaudio2_cf)); ret->IClassFactory_iface.lpVtbl = &XAudio2CF_Vtbl; ret->ref = 0; hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); if(FAILED(hr)) - HeapFree(GetProcessHeap(), 0, ret); + free(ret); return hr; }

1 0

Alexandre Julliard : winex11: Work around a false positive gcc warning.
by Alexandre Julliard 21 Aug '23

21 Aug '23

Module: wine Branch: master Commit: 7d013ed86cd82c50f813f2e7ef2145ed04b805db URL: https://gitlab.winehq.org/wine/wine/-/commit/7d013ed86cd82c50f813f2e7ef2145… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 20 12:45:35 2023 +0200 winex11: Work around a false positive gcc warning. --- dlls/winex11.drv/clipboard.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6f233418105..087e0aab79b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1850,7 +1850,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, { int aformat; unsigned long pos = 0, nitems, remain, count; - unsigned char *val = NULL, *buffer; + unsigned char *val = NULL, *new_val, *buffer; for (;;) { @@ -1863,15 +1863,13 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, } count = get_property_size( aformat, nitems ); - *data = realloc( val, pos * sizeof(int) + count + 1 ); - - if (!*data) + if (!(new_val = realloc( val, pos * sizeof(int) + count + 1 ))) { XFree( buffer ); free( val ); return FALSE; } - val = *data; + val = new_val; memcpy( (int *)val + pos, buffer, count ); XFree( buffer ); if (!remain) @@ -1889,6 +1887,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, /* Delete the property on the window now that we are done * This will send a PropertyNotify event to the selection owner. */ XDeleteProperty(display, w, prop); + *data = val; return TRUE; }

1 0

Alexandre Julliard : Wine release 8.14
by Alexandre Julliard 18 Aug '23

18 Aug '23

Module: website Branch: master Commit: bd0ea8deb5f215ea8a9cfc5562341484309ed951 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/bd0ea8deb5f215ea8a9cfc5562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 18 22:04:37 2023 +0200 Wine release 8.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023081801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023081801.xml b/news/en/2023081801.xml new file mode 100644 index 00000000..9939279e --- /dev/null +++ b/news/en/2023081801.xml @@ -0,0 +1,16 @@ +<news> +<date>August 18, 2023</date> +<title>Wine 8.14 Released</title> +<body> + The Wine development release 8.14 is now available. + <a href="{$root}/announce/8.14">What's new</a> in this release: +<ul> + <li>PCSC framework used on macOS for smart card support.</li> + <li>Dumping of Windows registry files in WineDump.</li> + <li>Fixes for Wow64 window messages.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.14 : Alexandre Julliard : Release 8.14
by Alexandre Julliard 18 Aug '23

18 Aug '23

Module: wine Branch: refs/tags/wine-8.14 Tag: cdaefb764860b4bcc2e150fee5b3a982f9242938 URL: https://gitlab.winehq.org/wine/wine/-/tags/cdaefb764860b4bcc2e150fee5b3a982… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 18 22:02:04 2023 +0200 Release 8.14

1 0

Alexandre Julliard : Release 8.14.
by Alexandre Julliard 18 Aug '23

18 Aug '23

Module: wine Branch: master Commit: ec3b773872ead22731b494be31e784aedccfc129 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec3b773872ead22731b494be31e784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 18 21:57:17 2023 +0200 Release 8.14. --- ANNOUNCE | 1060 ++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 633 insertions(+), 451 deletions(-)

1 0

Tim Clem : ntdll: Add error and warning logs in more cases of memory exhaustion.
by Alexandre Julliard 18 Aug '23

18 Aug '23

Module: wine Branch: master Commit: 9d6aabb202a080970a50f52a7e8bfebbea6fb562 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d6aabb202a080970a50f52a7e8bfe… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Aug 17 10:26:23 2023 -0700 ntdll: Add error and warning logs in more cases of memory exhaustion. --- dlls/ntdll/unix/virtual.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 897c92b6349..078fe1c30a9 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1010,7 +1010,10 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) { if (pages_vprot[i]) continue; if ((ptr = anon_mmap_alloc( pages_vprot_mask + 1, PROT_READ | PROT_WRITE )) == MAP_FAILED) + { + ERR( "anon mmap error %s for vprot table, size %08lx\n", strerror(errno), pages_vprot_mask + 1 ); return FALSE; + } pages_vprot[i] = ptr; } #endif @@ -1355,7 +1358,10 @@ static void *map_free_area( void *base, void *end, size_t size, int top_down, in } if (!first) - return try_map_free_area( base, end, step, start, size, unix_prot ); + start = try_map_free_area( base, end, step, start, size, unix_prot ); + + if (!start) + ERR( "couldn't map free area in range %p-%p, size %p", base, end, (void *)size ); return start; } @@ -1949,9 +1955,18 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) return STATUS_SUCCESS; failed: - if (errno == ENOMEM) status = STATUS_NO_MEMORY; + if (errno == ENOMEM) + { + ERR( "out of memory for %p-%p\n", base, (char *)base + size ); + status = STATUS_NO_MEMORY; + } else if (errno == EEXIST) status = STATUS_CONFLICTING_ADDRESSES; - else status = STATUS_INVALID_PARAMETER; + else + { + ERR( "mmap error %s for %p-%p, unix_prot %#x\n", + strerror(errno), base, (char *)base + size, unix_prot ); + status = STATUS_INVALID_PARAMETER; + } unmap_area( base, start - (char *)base ); return status; } @@ -2028,8 +2043,10 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if ((ptr = anon_mmap_alloc( view_size, get_unix_prot(vprot) )) == MAP_FAILED) { - if (errno == ENOMEM) return STATUS_NO_MEMORY; - return STATUS_INVALID_PARAMETER; + status = (errno == ENOMEM) ? STATUS_NO_MEMORY : STATUS_INVALID_PARAMETER; + ERR( "anon mmap error %s, size %p, unix_prot %#x\n", + strerror(errno), (void *)view_size, get_unix_prot( vprot ) ); + return status; } TRACE( "got mem with anon mmap %p-%p\n", ptr, (char *)ptr + size ); /* if we got something beyond the user limit, unmap it and retry */ @@ -2098,13 +2115,20 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start if (prot & PROT_EXEC) WARN( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); break; default: + ERR( "mmap error %s, range %p-%p, unix_prot %#x\n", + strerror(errno), (char *)view->base + start, (char *)view->base + start + size, prot ); return STATUS_NO_MEMORY; } } /* Reserve the memory with an anonymous mmap */ ptr = anon_mmap_fixed( (char *)view->base + start, size, PROT_READ | PROT_WRITE, 0 ); - if (ptr == MAP_FAILED) return STATUS_NO_MEMORY; + if (ptr == MAP_FAILED) + { + ERR( "anon mmap error %s, range %p-%p\n", + strerror(errno), (char *)view->base + start, (char *)view->base + start + size ); + return STATUS_NO_MEMORY; + } /* Now read in the file */ pread( fd, ptr, size, offset ); if (prot != (PROT_READ|PROT_WRITE)) mprotect( ptr, size, prot ); /* Set the right protection */ @@ -2407,6 +2431,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) WARN( "file system doesn't support mmap, falling back to read\n" ); break; default: + ERR( "mmap error %s, range %p-%p\n", strerror(errno), ptr, (char *)ptr + size ); return STATUS_NO_MEMORY; } *removable = TRUE; @@ -4282,6 +4307,9 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ *ret = base; *size_ptr = size; } + else if (status == STATUS_NO_MEMORY) + ERR( "out of memory for allocation, base %p size %08lx\n", base, size ); + return status; } @@ -4328,6 +4356,11 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z *ret = wine_server_get_ptr( result.virtual_alloc.addr ); *size_ptr = result.virtual_alloc.size; } + else + { + WARN( "cross-process allocation failed, process=%p base=%p size=%08lx status=%08x", + process, *ret, *size_ptr, result.virtual_alloc.status ); + } return result.virtual_alloc.status; }

1 0

Stefan Dösinger : wined3d: Move zero swapchain parameter fixup to wined3d_swapchain_state_init.
by Alexandre Julliard 18 Aug '23

18 Aug '23

Module: wine Branch: master Commit: 77fb8e04e4c415960df04db58438154649ed76d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/77fb8e04e4c415960df04db5843815… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 8 15:32:06 2023 +0300 wined3d: Move zero swapchain parameter fixup to wined3d_swapchain_state_init. --- dlls/wined3d/swapchain.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 85088f7b3ea..30930bc17b6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1400,7 +1400,31 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat return hr; } - if (!desc->windowed) + if (state->desc.windowed) + { + RECT client_rect; + + GetClientRect(window, &client_rect); + TRACE("Client rect %s.\n", wine_dbgstr_rect(&client_rect)); + + if (!state->desc.backbuffer_width) + { + state->desc.backbuffer_width = client_rect.right ? client_rect.right : 8; + TRACE("Updating width to %u.\n", state->desc.backbuffer_width); + } + if (!state->desc.backbuffer_height) + { + state->desc.backbuffer_height = client_rect.bottom ? client_rect.bottom : 8; + TRACE("Updating height to %u.\n", state->desc.backbuffer_height); + } + + if (state->desc.backbuffer_format == WINED3DFMT_UNKNOWN) + { + state->desc.backbuffer_format = state->original_mode.format_id; + TRACE("Updating format to %s.\n", debug_d3dformat(state->original_mode.format_id)); + } + } + else { if (desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1487,7 +1511,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc struct wined3d_output_desc output_desc; BOOL displaymode_set = FALSE; HRESULT hr = E_FAIL; - RECT client_rect; unsigned int i; HWND window; @@ -1523,29 +1546,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc swapchain->swap_interval = WINED3D_SWAP_INTERVAL_DEFAULT; swapchain_set_max_frame_latency(swapchain, device); - GetClientRect(window, &client_rect); - if (swapchain->state.desc.windowed) - { - TRACE("Client rect %s.\n", wine_dbgstr_rect(&client_rect)); - - if (!swapchain->state.desc.backbuffer_width) - { - swapchain->state.desc.backbuffer_width = client_rect.right ? client_rect.right : 8; - TRACE("Updating width to %u.\n", swapchain->state.desc.backbuffer_width); - } - if (!desc->backbuffer_height) - { - swapchain->state.desc.backbuffer_height = client_rect.bottom ? client_rect.bottom : 8; - TRACE("Updating height to %u.\n", swapchain->state.desc.backbuffer_height); - } - - if (swapchain->state.desc.backbuffer_format == WINED3DFMT_UNKNOWN) - { - swapchain->state.desc.backbuffer_format = swapchain->state.original_mode.format_id; - TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->state.original_mode.format_id)); - } - } - else + if (!swapchain->state.desc.windowed) { if (FAILED(hr = wined3d_output_get_desc(desc->output, &output_desc))) {

1 0

Stefan Dösinger : dxgi/tests: Test swapchains with zero dimensions.
by Alexandre Julliard 18 Aug '23

18 Aug '23

Module: wine Branch: master Commit: ab6c51f28a34a9f37d8f20453d66f883e2d7b5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ab6c51f28a34a9f37d8f20453d66f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 4 15:37:20 2023 +0300 dxgi/tests: Test swapchains with zero dimensions. --- dlls/dxgi/tests/dxgi.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 020c6485d50..5b007d8a626 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7886,6 +7886,75 @@ done: ok(!refcount, "Device has %lu references left.\n", refcount); } +static void test_zero_size(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + unsigned int i, expected; + IDXGIFactory *factory; + HWND window; + HRESULT hr; + RECT r; + + static const struct + { + INT w, h; + } + tests[] = + { + {0, 0}, + {200, 0}, + {0, 200}, + {200, 200}, + /* FIXME: How to create a window with a client rect width or height above 0 but less than 8? + * If I try to AdjustWindowRect a (100,100)-(104,104) rectangle I get a larger window. I + * suspect the decoration style and DPI will play into it too. The size below creates a + * 176x4 client rect on my system. */ + {100, 60} + }; + + get_factory(device, is_d3d12, &factory); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + window = CreateWindowA("static", "dxgi_test", WS_VISIBLE, 0, 0, tests[i].w, tests[i].h, 0, 0, 0, 0); + swapchain_desc.BufferDesc.Width = 0; + swapchain_desc.BufferDesc.Height = 0; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.OutputWindow = window; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!swapchain_desc.BufferDesc.Width && !swapchain_desc.BufferDesc.Height, "Input desc was modified.\n"); + + hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + GetClientRect(swapchain_desc.OutputWindow, &r); + expected = r.right > 0 ? r.right : 8; + ok(swapchain_desc.BufferDesc.Width == expected, "Got width %u, expected %u, test %u.\n", + swapchain_desc.BufferDesc.Width, expected, i); + expected = r.bottom > 0 ? r.bottom : 8; + ok(swapchain_desc.BufferDesc.Height == expected, "Got height %u, expected %u, test %u.\n", + swapchain_desc.BufferDesc.Height, expected, i); + + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); + } + + IDXGIFactory_Release(factory); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -8010,6 +8079,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_present_count); run_on_d3d10(test_resize_target_wndproc); run_on_d3d10(test_swapchain_window_messages); + run_on_d3d10(test_zero_size); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -8043,6 +8113,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_present_count); run_on_d3d12(test_resize_target_wndproc); run_on_d3d12(test_swapchain_window_messages); + run_on_d3d12(test_zero_size); FreeLibrary(d3d12_module); }

1 0