- Wine-Commits - list.winehq.org

Alex Henrie : mp3dmod: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 6d6ea43d386d6b42c01ee8caca5e3afc52a780e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d6ea43d386d6b42c01ee8caca5e3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:34:41 2023 -0600 mp3dmod: Use CRT allocation functions. --- dlls/mp3dmod/mp3dmod.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 12c34421ce9..842be5889da 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -31,7 +31,6 @@ #include "rpcproxy.h" #include "wmcodecdsp.h" #include "wine/debug.h" -#include "wine/heap.h" #include "initguid.h" DEFINE_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); @@ -107,7 +106,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) MoFreeMediaType(&This->intype); MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); - heap_free(This); + free(This); } return refcount; } @@ -575,7 +574,7 @@ static HRESULT create_mp3_decoder(IUnknown *outer, REFIID iid, void **obj) HRESULT hr; int err; - if (!(This = heap_alloc_zero(sizeof(*This)))) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IUnknown_inner.lpVtbl = &Unknown_vtbl;

1 0

Alex Henrie : jsproxy: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1df98a99cd6a53c4bb842169a639c2644c42b6c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1df98a99cd6a53c4bb842169a639c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:33:04 2023 -0600 jsproxy: Use CRT allocation functions. --- dlls/jsproxy/main.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index b93d1200f42..4e69210dce3 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -31,7 +31,6 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); @@ -50,7 +49,7 @@ static inline WCHAR *strdupAW( const char *src, int len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + if ((dst = malloc( (dst_len + 1) * sizeof(WCHAR) ))) { len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); dst[dst_len] = 0; @@ -65,7 +64,7 @@ static inline char *strdupWA( const WCHAR *src ) if (src) { int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); - if ((dst = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); } return dst; } @@ -85,7 +84,7 @@ BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) EnterCriticalSection( &cs_jsproxy ); - heap_free( global_script->text ); + free( global_script->text ); global_script->text = NULL; LeaveCriticalSection( &cs_jsproxy ); @@ -104,17 +103,17 @@ static WCHAR *load_script( const char *filename ) if (handle == INVALID_HANDLE_VALUE) return NULL; size = GetFileSize( handle, NULL ); - if (!(buffer = heap_alloc( size ))) goto done; + if (!(buffer = malloc( size ))) goto done; if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); - if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + if (!(script = malloc( (len + 1) * sizeof(WCHAR) ))) goto done; MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); script[len] = 0; done: CloseHandle( handle ); - heap_free( buffer ); + free( buffer ); return script; } @@ -141,13 +140,13 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile LeaveCriticalSection( &cs_jsproxy ); return FALSE; } - heap_free( global_script->text ); + free( global_script->text ); if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; } else { - heap_free( global_script->text ); + free( global_script->text ); if ((global_script->text = load_script( tmpfile ))) ret = TRUE; } @@ -263,10 +262,10 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format ) GetComputerNameExA( format, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; - if (!(ret = heap_alloc( size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; if (!GetComputerNameExA( format, ret, &size )) { - heap_free( ret ); + free( ret ); return NULL; } return ret; @@ -295,7 +294,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) if (!hostnameA) return E_OUTOFMEMORY; res = getaddrinfo( hostnameA, NULL, NULL, &ai ); - heap_free( hostnameA ); + free( hostnameA ); if (res) return S_FALSE; elem = ai; @@ -589,8 +588,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); done: - heap_free( hostnameW ); - heap_free( urlW ); + free( hostnameW ); + free( urlW ); LeaveCriticalSection( &cs_jsproxy ); return ret; }

1 0

Alex Henrie : dhcpcsvc/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 06294b0dbf31b364b79bcad3bd4e3ad68a9da104 URL: https://gitlab.winehq.org/wine/wine/-/commit/06294b0dbf31b364b79bcad3bd4e3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:24:20 2023 -0600 dhcpcsvc/tests: Use CRT allocation functions. --- dlls/dhcpcsvc/tests/dhcpcsvc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 52b1b150ad8..8e5d0afa30c 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -27,18 +27,16 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) { ULONG err, size = 1024; - IP_ADAPTER_ADDRESSES *ret = HeapAlloc( GetProcessHeap(), 0, size ); for (;;) { + IP_ADAPTER_ADDRESSES *ret = malloc( size ); err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ret, &size ); - if (err != ERROR_BUFFER_OVERFLOW) break; - ret = HeapReAlloc( GetProcessHeap(), 0, ret, size ); + if (err == ERROR_SUCCESS) return ret; + free( ret ); + if (err != ERROR_BUFFER_OVERFLOW) return NULL; } - if (err == ERROR_SUCCESS) return ret; - HeapFree( GetProcessHeap(), 0, ret ); - return NULL; } static void test_DhcpRequestParams(void) @@ -86,12 +84,12 @@ static void test_DhcpRequestParams(void) recv_params.Params = params; size = 0; - buf = HeapAlloc( GetProcessHeap(), 0, size ); + buf = NULL; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); while (err == ERROR_MORE_DATA) { - buf = HeapReAlloc( GetProcessHeap(), 0, buf, size ); + buf = realloc( buf, size ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); } @@ -117,13 +115,13 @@ static void test_DhcpRequestParams(void) case OPTION_MSFT_IE_PROXY: if (params[i].Data) { - char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 ); + char *str = malloc( params[i].nBytesData + 1 ); memcpy( str, params[i].Data, params[i].nBytesData ); str[params[i].nBytesData] = 0; trace( "%lu: Data %p (%s) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, str, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); - HeapFree( GetProcessHeap(), 0, str ); + free( str ); } break; default: @@ -132,9 +130,9 @@ static void test_DhcpRequestParams(void) } } } - HeapFree( GetProcessHeap(), 0, buf ); + free( buf ); } - HeapFree( GetProcessHeap(), 0, adapters ); + free( adapters ); } START_TEST(dhcpcsvc)

1 0

Alex Henrie : diasymreader: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: c9d4b515f5400f3f24cf1e89f2d7e55ba099732d URL: https://gitlab.winehq.org/wine/wine/-/commit/c9d4b515f5400f3f24cf1e89f2d7e5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:25:39 2023 -0600 diasymreader: Use CRT allocation functions. --- dlls/diasymreader/main.c | 4 ++-- dlls/diasymreader/writer.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/diasymreader/main.c b/dlls/diasymreader/main.c index da64a156714..28e0525d75c 100644 --- a/dlls/diasymreader/main.c +++ b/dlls/diasymreader/main.c @@ -95,7 +95,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -133,7 +133,7 @@ static HRESULT ClassFactoryImpl_Constructor(const classinfo *info, REFIID riid, *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactoryImpl)); + This = malloc(sizeof(ClassFactoryImpl)); if (!This) return E_OUTOFMEMORY; This->IClassFactory_iface.lpVtbl = &ClassFactoryImpl_Vtbl; diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 3c07b77ab81..55e0615c58e 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -28,7 +28,6 @@ #include "wine/mscvpdb.h" #include "wine/debug.h" -#include "wine/heap.h" #include "diasymreader_private.h" @@ -107,7 +106,7 @@ static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface if (ref == 0) { - heap_free(This); + free(This); } return ref; @@ -187,7 +186,7 @@ static ULONG WINAPI SymWriter_Release(ISymUnmanagedWriter5 *iface) { This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - heap_free(This); + free(This); } return ref; @@ -205,7 +204,7 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons if (!pRetVal) return E_POINTER; - result = heap_alloc(sizeof(*result)); + result = malloc(sizeof(*result)); if (!result) return E_OUTOFMEMORY; @@ -596,7 +595,7 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) SymWriter *This; HRESULT hr; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY;

1 0

Alex Henrie : dsuiext: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: e90e08b5991eaf048b64e70c9053fa7c44f28e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/e90e08b5991eaf048b64e70c9053fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:28:05 2023 -0600 dsuiext: Use CRT allocation functions. --- dlls/dsuiext/dsuiext.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dsuiext/dsuiext.c b/dlls/dsuiext/dsuiext.c index 762f7596e73..5867c677f68 100644 --- a/dlls/dsuiext/dsuiext.c +++ b/dlls/dsuiext/dsuiext.c @@ -28,7 +28,6 @@ #include "iads.h" #include "dsclient.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dsuiext); @@ -76,7 +75,7 @@ static ULONG WINAPI dispspec_Release(IDsDisplaySpecifier *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(dispspec); + free(dispspec); } return ref; @@ -180,7 +179,7 @@ static HRESULT DsDisplaySpecifier_create(REFIID iid, void **obj) DisplaySpec *dispspec; HRESULT hr; - dispspec = heap_alloc(sizeof(*dispspec)); + dispspec = malloc(sizeof(*dispspec)); if (!dispspec) return E_OUTOFMEMORY; dispspec->IDsDisplaySpecifier_iface.lpVtbl = &IDsDisplaySpecifier_vtbl; @@ -250,7 +249,7 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) TRACE("(%p) ref %lu\n", iface, ref); if (!ref) - heap_free(factory); + free(factory); return ref; } @@ -289,7 +288,7 @@ static HRESULT factory_constructor(const struct class_info *info, REFIID riid, v class_factory *factory; HRESULT hr; - factory = heap_alloc(sizeof(*factory)); + factory = malloc(sizeof(*factory)); if (!factory) return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &factory_vtbl;

1 0

Alex Henrie : dhcpcsvc: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 2936bb4a2958d52fdb62a1b3996f0d8bea39ae80 URL: https://gitlab.winehq.org/wine/wine/-/commit/2936bb4a2958d52fdb62a1b3996f0d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:21:29 2023 -0600 dhcpcsvc: Use CRT allocation functions. --- dlls/dhcpcsvc/dhcpcsvc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index 57bb9a9b6ff..37098610760 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -32,7 +32,6 @@ #include "ddk/mountmgr.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); @@ -102,7 +101,7 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); size = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[recv_params.nParams]) + *buflen; - if (!(query = heap_alloc_zero( size ))) + if (!(query = calloc( 1, size ))) { err = ERROR_OUTOFMEMORY; goto done; @@ -146,7 +145,7 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC err = ERROR_SUCCESS; done: - heap_free( query ); + free( query ); CloseHandle( mgr ); return err; }

1 0

Alex Henrie : adsldp: Remove unused heap.h include.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 4782d0e06196530ac4a9d90a60d4949d0e6da11e URL: https://gitlab.winehq.org/wine/wine/-/commit/4782d0e06196530ac4a9d90a60d494… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:13:52 2023 -0600 adsldp: Remove unused heap.h include. --- dlls/adsldp/schema.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index d8d0d7e9cde..94b1000ec32 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -25,7 +25,6 @@ #include "adsldp_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp);

1 0

Alex Henrie : avrt: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 7c05d3902372fd965f17a3e139e5a51a8f5e6e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c05d3902372fd965f17a3e139e5a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:15:20 2023 -0600 avrt: Use CRT allocation functions. --- dlls/avrt/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index abcf0ab68ab..68af35c891a 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,18 +23,17 @@ #include "winbase.h" #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" #include "avrt.h" WINE_DEFAULT_DEBUG_CHANNEL(avrt); -static inline WCHAR *heap_strdupAW(const char *src) +static inline WCHAR *strdupAW(const char *src) { int len; WCHAR *dst; if (!src) return NULL; len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); - if ((dst = heap_alloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + if ((dst = malloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); return dst; } @@ -43,7 +42,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) WCHAR *nameW = NULL; HANDLE ret; - if (name && !(nameW = heap_strdupAW(name))) + if (name && !(nameW = strdupAW(name))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -51,7 +50,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) ret = AvSetMmThreadCharacteristicsW(nameW, index); - heap_free(nameW); + free(nameW); return ret; } @@ -97,13 +96,13 @@ HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *ta WCHAR *task1W = NULL, *task2W = NULL; HANDLE ret; - if (task1 && !(task1W = heap_strdupAW(task1))) + if (task1 && !(task1W = strdupAW(task1))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; } - if (task2 && !(task2W = heap_strdupAW(task2))) + if (task2 && !(task2W = strdupAW(task2))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -111,8 +110,8 @@ HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *ta ret = AvSetMmMaxThreadCharacteristicsW(task1W, task2W, index); - heap_free(task2W); - heap_free(task1W); + free(task2W); + free(task1W); return ret; }

1 0

Alex Henrie : quartz: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: f73a8396124d237dee5d012bace3610f81bc3c48 URL: https://gitlab.winehq.org/wine/wine/-/commit/f73a8396124d237dee5d012bace361… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:04:45 2023 -0600 quartz: Use debugstr_fourcc instead of debugstr_an. --- dlls/quartz/filtermapper.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 69755c3648e..87d7c4bb5d5 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -373,7 +373,7 @@ struct REG_RF struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ + DWORD signature; /* e.g. '0pi3' */ DWORD dwFlags; DWORD dwInstances; DWORD dwMediaTypes; @@ -384,7 +384,7 @@ struct REG_RFP struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ + DWORD signature; /* e.g. '0ty3' */ DWORD dwUnused; DWORD dwOffsetMajor; DWORD dwOffsetMinor; @@ -613,11 +613,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG REGFILTERPINS2 rgPin2 = prf2->rgPins2[i]; unsigned int j; - rrfp.signature[0] = '0'; - rrfp.signature[1] = 'p'; - rrfp.signature[2] = 'i'; - rrfp.signature[3] = '3'; - rrfp.signature[0] += i; + rrfp.signature = MAKEFOURCC('0'+i,'p','i','3'); rrfp.dwFlags = rgPin2.dwFlags; rrfp.dwInstances = rgPin2.cInstances; rrfp.dwMediaTypes = rgPin2.nMediaTypes; @@ -639,11 +635,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG { struct REG_TYPE rt; const CLSID * clsMinorType = rgPin2.lpMediaType[j].clsMinorType ? rgPin2.lpMediaType[j].clsMinorType : &MEDIASUBTYPE_NULL; - rt.signature[0] = '0'; - rt.signature[1] = 't'; - rt.signature[2] = 'y'; - rt.signature[3] = '3'; - rt.signature[0] += j; + rt.signature = MAKEFOURCC('0'+j,'t','y','3'); rt.dwUnused = 0; rt.dwOffsetMajor = find_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) @@ -726,7 +718,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) /* FIXME: check signature */ - TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4)); + TRACE("\tsignature = %s\n", debugstr_fourcc(prrfp->signature)); TRACE("\tPin %lu: dwFlags %#lx, dwInstances %lu, dwMediaTypes %lu, dwMediums %lu.\n", i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums); @@ -760,7 +752,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) CLSID * clsMinor = CoTaskMemAlloc(sizeof(CLSID)); /* FIXME: check signature */ - TRACE("\t\tsignature = %s\n", debugstr_an((const char*)prt->signature, 4)); + TRACE("\t\tsignature = %s\n", debugstr_fourcc(prt->signature)); memcpy(clsMajor, pData + prt->dwOffsetMajor, sizeof(CLSID)); memcpy(clsMinor, pData + prt->dwOffsetMinor, sizeof(CLSID));

1 0

Zhiyi Zhang : ddraw: Restore WS_EX_TOPMOST in exclusive fullscreen mode if it got removed.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 9092a4ccca9d9da93a5fb0d611c05c3aae4882c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9092a4ccca9d9da93a5fb0d611c05c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 19 17:30:23 2023 +0800 ddraw: Restore WS_EX_TOPMOST in exclusive fullscreen mode if it got removed. Tests show that there is a ~1.5s timer that checks for the presence of WS_EX_TOPMOST and restore it if it got removed when the timer times out. Manual tests that skip WM_TIMER handling show there is a 1.5s timer of ID 0x4242 keeps firing. The timer stops when its WM_TIMER message gets handled. Fix Deus Ex: Game of the Year Edition missing WS_EX_TOPMOST after changing resolutions in fullscreen mode. The application removes WS_EX_TOPMOST from its game window after entering fullscreen. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- dlls/wined3d/swapchain.c | 28 ++++++++++++++++++++++++++++ include/wine/wined3d.h | 1 + 8 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 94b38258acd..5887854556b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -587,7 +587,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + swapchain_desc.flags = DDRAW_WINED3D_SWAPCHAIN_FLAGS; if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetForegroundWindow()) swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d8bd335f615..f40188f75ef 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -64,6 +64,9 @@ struct FvfToDecl | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR \ | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NO_DRAW_INDIRECT) +#define DDRAW_WINED3D_SWAPCHAIN_FLAGS (WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH \ + | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER) + #define DDRAW_MAX_ACTIVE_LIGHTS 32 #define DDRAW_MAX_TEXTURES 8 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e7483c30863..02d6adbb433 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2807,7 +2807,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b51ebff0006..f4cc5df0558 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2893,7 +2893,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw2_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0b1eb1e197b..4811053a231 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3131,7 +3131,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw4_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 68b96ff6e7c..ab43c1bbb2d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2850,7 +2850,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw7_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 99d717641e1..c30c43734c0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2151,8 +2151,20 @@ struct wined3d_window_state int x, y, width, height; uint32_t flags; bool set_style; + bool register_topmost_timer; + bool set_topmost_timer; }; +#define WINED3D_WINDOW_TOPMOST_TIMER_ID 0x4242 + +static void CALLBACK topmost_timer_proc(HWND hwnd, UINT msg, UINT_PTR id, DWORD time) +{ + if (!(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + KillTimer(hwnd, WINED3D_WINDOW_TOPMOST_TIMER_ID); +} + static DWORD WINAPI set_window_state_thread(void *ctx) { struct wined3d_window_state *s = ctx; @@ -2176,6 +2188,7 @@ static DWORD WINAPI set_window_state_thread(void *ctx) static void set_window_state(struct wined3d_window_state *s) { + static const UINT timeout = 1500; DWORD window_tid = GetWindowThreadProcessId(s->window, NULL); DWORD tid = GetCurrentThreadId(); HANDLE thread; @@ -2187,6 +2200,17 @@ static void set_window_state(struct wined3d_window_state *s) if (window_tid == tid) { set_window_state_thread(s); + + /* Deus Ex: Game of the Year Edition removes WS_EX_TOPMOST after changing resolutions in + * exclusive fullscreen mode. Tests show that WS_EX_TOPMOST will be restored when a ~1.5s + * timer times out */ + if (s->register_topmost_timer) + { + if (s->set_topmost_timer) + SetTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID, timeout, topmost_timer_proc); + else + KillTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID); + } } else if ((thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) { @@ -2239,6 +2263,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state s->style = fullscreen_style(state->style); s->exstyle = fullscreen_exstyle(state->exstyle); s->set_style = true; + s->register_topmost_timer = !!(state->desc.flags & WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER); + s->set_topmost_timer = true; TRACE("Old style was %08lx, %08lx, setting to %08lx, %08lx.\n", state->style, state->exstyle, s->style, s->exstyle); @@ -2293,6 +2319,8 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ s->set_style = style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle); + s->register_topmost_timer = !!(state->desc.flags & WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER); + s->set_topmost_timer = false; if (window_rect) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ad90c0d6b36..7c51c9cfef9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -902,6 +902,7 @@ enum wined3d_memory_segment_group #define WINED3D_SWAPCHAIN_REGISTER_STATE 0x00020000u #define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u +#define WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER 0x00100000u #define WINED3DDP_MAXTEXCOORD 8

1 0