- Wine-Devel - list.winehq.org

[PATCH] quartz: Use free() to free the "pszFileName" member.
by Zebediah Figura Feb. 20, 2021

Feb. 20, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cc252c0e0e0..cf5fe457715 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -340,7 +340,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter->source); - CoTaskMemFree(filter->pszFileName); + free(filter->pszFileName); FreeMediaType(&filter->mt); } -- 2.30.1

1 0

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad Feb. 20, 2021

Feb. 20, 2021

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

2 1

[PATCH] vkd3d-shader: Set default case the last one in shader_sm4_read_param().
by Andrey Gusev Feb. 20, 2021

Feb. 20, 2021

In file included from ../include/private/vkd3d_memory.h:27, з ../libs/vkd3d-shader/vkd3d_shader_private.h:50, з ../libs/vkd3d-shader/dxbc.c:20: ../libs/vkd3d-shader/dxbc.c: In function ‘shader_sm4_read_param’: ../include/private/vkd3d_debug.h:71:9: warning: this statement may fall through [-Wimplicit-fallthrough=] 71 | vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../include/private/vkd3d_debug.h:60:9: note: in expansion of macro ‘VKD3D_DBG_PRINTF’ 60 | VKD3D_DBG_PRINTF | ^~~~~~~~~~~~~~~~ ../include/private/vkd3d_debug.h:82:15: note: in expansion of macro ‘VKD3D_DBG_LOG’ 82 | #define FIXME VKD3D_DBG_LOG(FIXME) | ^~~~~~~~~~~~~ ../libs/vkd3d-shader/dxbc.c:1553:17: note: in expansion of macro ‘FIXME’ 1553 | FIXME("Skipping modifier 0x%08x.\n", m); | ^~~~~ ../libs/vkd3d-shader/dxbc.c:1554:13: note: here 1554 | case VKD3D_SM4_REGISTER_MODIFIER_NONE: | ^~~~ Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d-shader/dxbc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index bfc3cce..89868bd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1549,11 +1549,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr *modifier = VKD3DSPSM_ABSNEG; break; - default: - FIXME("Skipping modifier 0x%08x.\n", m); case VKD3D_SM4_REGISTER_MODIFIER_NONE: *modifier = VKD3DSPSM_NONE; break; + + default: + FIXME("Skipping modifier 0x%08x.\n", m); } } else -- 2.29.2

2 1

[PATCH 2/2] krnl386.exe: Cap GetFreeSpace value to 2GB.
by Akihiro Sagawa Feb. 20, 2021

Feb. 20, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] kernel32: Cap available physical memory size for really old binaries.
by Akihiro Sagawa Feb. 20, 2021

Feb. 20, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44931 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/heap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH v2 1/2] winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures.
by Zebediah Figura Feb. 20, 2021

Feb. 20, 2021

The latter has inconsistent alignment between the Unix and Win32 sides. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gst_private.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 03d19af1031..b8629fc8aa1 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -150,17 +150,18 @@ struct wg_parser_event struct { /* pts and duration are in 100-nanosecond units. */ - uint64_t pts, duration; + ULONGLONG pts, duration; uint32_t size; bool discontinuity, preroll, delta, has_pts, has_duration; } buffer; struct { - uint64_t position, stop; + ULONGLONG position, stop; double rate; } segment; } u; }; +C_ASSERT(sizeof(struct wg_parser_event) == 40); struct unix_funcs { -- 2.30.1

1 1

[PATCH 1/6] winegstreamer: Manually track read offsets in the media source.
by Zebediah Figura Feb. 20, 2021

Feb. 20, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/media_source.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a9a85cf4d4b..ffbf8041ed8 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -111,6 +111,8 @@ struct media_source SOURCE_SHUTDOWN, } state; HANDLE no_more_pads_event; + + uint64_t file_size, next_pull_offset; }; static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) @@ -449,11 +451,12 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of TRACE("requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, *buf); - if (ofs != GST_BUFFER_OFFSET_NONE) - { - if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) - return GST_FLOW_ERROR; - } + if (ofs == GST_BUFFER_OFFSET_NONE) + ofs = source->next_pull_offset; + source->next_pull_offset = ofs + len; + + if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) + return GST_FLOW_ERROR; if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) return GST_FLOW_ERROR; @@ -1244,6 +1247,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object; gint64 total_pres_time = 0; DWORD bytestream_caps; + uint64_t file_size; unsigned int i; HRESULT hr; int ret; @@ -1257,6 +1261,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size))) + { + FIXME("Failed to get byte stream length, hr %#x.\n", hr); + return hr; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1266,6 +1276,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ object->byte_stream = bytestream; IMFByteStream_AddRef(bytestream); object->no_more_pads_event = CreateEventA(NULL, FALSE, FALSE, NULL); + object->file_size = file_size; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; -- 2.30.1

3 7

[PATCH v2 resend 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye Feb. 20, 2021

Feb. 20, 2021

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..9d74caca986 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,83 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} START_TEST(iphlpapi) { @@ -2370,6 +2447,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

2 2

[PATCH website] website: Update Dutch webpages
by Floris Renaud Feb. 19, 2021

Feb. 19, 2021

Point the links to the Dutch wiki Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/nl/documentation.template | 2 +- templates/nl/forums.template | 2 +- templates/nl/getinvolved.template | 2 +- templates/nl/help.template | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/nl/documentation.template b/templates/nl/documentation.template index f379c9ca..4ef1989e 100644 --- a/templates/nl/documentation.template +++ b/templates/nl/documentation.template @@ -6,7 +6,7 @@ <h2>Handleidingen</h2> <ul> <li> - <a href="https://wiki.winehq.org/Wine User's Guide">Gebruikershandleiding van Wine</a><br> + <a href="https://wiki.winehq.org/Gebruikershandleiding">Gebruikershandleiding van Wine</a><br> Wine gebruiken en aanpassen om Windows programma's uit te voeren.<br> </li><br> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 8ac7740b..f4bb72c1 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -103,7 +103,7 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam.</p> [<a href="//www.winehq.org/pipermail/wine-bugs/">Archief 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archief 2</a>]<br> Een drukke lijst (100/dag) die alle activiteit op de - <a href="//bugs.winehq.org/">Bug Tracking Database</a>laat zien. + <a href="//bugs.winehq.org/">Bug Tracking Database</a> laat zien. </li> </ul> diff --git a/templates/nl/getinvolved.template b/templates/nl/getinvolved.template index 6ce0ac3f..cb07e0fa 100644 --- a/templates/nl/getinvolved.template +++ b/templates/nl/getinvolved.template @@ -14,7 +14,7 @@ Op deze pagina staat hoe u betrokken raakt bij Wine.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Main_Page#Contribute">Bijdragen aan Wine</a> + <a href="https://wiki.winehq.org/Startpagina#Meedoen">Bijdragen aan Wine</a> </div> <div class="col-xs-9 col-md-10"> Een lijst met manieren om aan Wine bij te dragen. diff --git a/templates/nl/help.template b/templates/nl/help.template index 80e44789..656c06c0 100644 --- a/templates/nl/help.template +++ b/templates/nl/help.template @@ -22,11 +22,11 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/FAQ"><i class="fas fa-info-circle fa-2x"></i><br>FAQ</a> + <a href="https://wiki.winehq.org/FAQ_nl"><i class="fas fa-info-circle fa-2x"></i><br>FAQ</a> </div> <div class="col-xs-10 col-md-11"> Veel vragen worden snel beantwoord op onze - <a href="https://wiki.winehq.org/FAQ">Veel Gestelde Vragen</a> pagina. + <a href="https://wiki.winehq.org/FAQ_nl">Veel Gestelde Vragen</a> pagina. Bekijk deze pagina eerst om te zien of de vraag al beantwoord is. </div> </div> @@ -44,10 +44,10 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/"><i class="fas fa-book fa-2x"></i><br>Wiki</a> + <a href="https://wiki.winehq.org/Startpagina"><i class="fas fa-book fa-2x"></i><br>Wiki</a> </div> <div class="col-xs-10 col-md-11"> - Doorzoek ook de <a href="https://wiki.winehq.org/">Wiki</a> om een + Doorzoek ook de <a href="https://wiki.winehq.org/Startpagina">Wiki</a> om een antwoord te vinden. </div> </div> -- 2.30.0

1 0

[PATCH v2 2/2] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes Feb. 19, 2021

Feb. 19, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 39 +++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 913cabe1e48..a3a0e490024 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -974,8 +974,43 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.0

1 0