June 2021 - Wine-devel - list.winehq.org

[WineHQ] include: Fix the spelling of a comment.
by Francois Gouget 19 Jun '21

19 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/htaccess.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index dbb7adf3..8de6b96d 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -89,7 +89,7 @@ RedirectMatch ^/(FAQ|Faq)$ https://wiki.winehq.org/FAQ RedirectMatch ^/(BUGS|Bugs|bugs)$ https://bugs.winehq.org/ RedirectMatch ^/(TROUBLE|Trouble|trouble)$ https://wiki.winehq.org/FAQ -# redirect soure website +# redirect source website RedirectMatch ^/WineAPI(.*)$ https://source.winehq.org/WineAPI$1 RedirectMatch ^/source(.*)$ https://source.winehq.org/source$1 RedirectMatch ^/cvsweb(.*)$ https://cvs.winehq.org/cvsweb$1 -- 2.20.1

1 0

[PATCH 4/4] shell32/tests: Add tests to show relative known folder paths match SHGetKnownFolderPath
by Andrew Eikum 19 Jun '21

19 Jun '21

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 64 ++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4c9b9693983..504812bad5d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -291,6 +291,18 @@ static const char *getFolderName(int folder) } } +LPWSTR wcscasestr( LPCWSTR str, LPCWSTR sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && towlower(*p1) == towlower(*p2)) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + /* Standard CSIDL values (and their flags) uses only two less-significant bytes */ #define NO_CSIDL 0x10000 #define WINE_ATTRIBUTES_OPTIONAL 0x20000 @@ -1964,10 +1976,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId HRESULT hr; int csidl, expectedCsidl, ret; KNOWNFOLDER_DEFINITION kfd; - IKnownFolder *folder; + IKnownFolder *folder, *kf_parent; WCHAR sName[1024]; BOOL found = FALSE; unsigned int i; + WCHAR *ikf_path, *gkfp_path, *ikf_parent_path; for (i = 0; i < ARRAY_SIZE(known_folders); ++i) { @@ -2019,10 +2032,57 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId ok_(__FILE__, known_folder->line)(!(kfd.kfdFlags & (~known_folder->definitionFlags)), "invalid known folder flags for %s: 0x%08x expected, but 0x%08x retrieved\n", known_folder->sFolderId, known_folder->definitionFlags, kfd.kfdFlags); + gkfp_path = NULL; + hr = pSHGetKnownFolderPath(folderId, KF_FLAG_DEFAULT, NULL, &gkfp_path); + if(SUCCEEDED(hr)) + { + ikf_path = NULL; + hr = IKnownFolder_GetPath(folder, KF_FLAG_DEFAULT, &ikf_path); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolder::GetPath failed: 0x%08x\n", hr); + ok_(__FILE__, known_folder->line)(ikf_path != NULL, "SHGetKnownFolderPath gave NULL path\n"); + + /* IKnownFolder::GetPath and SHGetKnownFolderPath should be the same */ + ok_(__FILE__, known_folder->line)(lstrcmpW(gkfp_path, ikf_path) == 0, "Got different paths: %s vs %s\n", + debugstr_w(gkfp_path), debugstr_w(ikf_path)); + + if(kfd.pszRelativePath) + { + /* RelativePath should be a substring of the path */ + ok_(__FILE__, known_folder->line)(wcscasestr(ikf_path, kfd.pszRelativePath) != NULL, + "KNOWNFOLDER_DEFINITION.pszRelativePath %s is not a substring of full path %s\n", + debugstr_w(kfd.pszRelativePath), debugstr_w(ikf_path)); + + hr = IKnownFolderManager_GetFolder(mgr, &kfd.fidParent, &kf_parent); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolderManager::GetFolder(parent) failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)) + { + ikf_parent_path = NULL; + hr = IKnownFolder_GetPath(kf_parent, KF_FLAG_DEFAULT, &ikf_parent_path); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolder::GetPath(parent) failed: 0x%08x\n", hr); + + /* Parent path + pszRelativePath should give the full path */ + ok_(__FILE__, known_folder->line)(memcmp(ikf_parent_path, ikf_path, lstrlenW(ikf_parent_path) * sizeof(WCHAR)) == 0, + "Full path %s does not start with parent path %s\n", + debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); + ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', + "Missing slash\n"); + ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + "Full path %s does not end with relative path %s\n", + debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath)); + + CoTaskMemFree(ikf_parent_path); + IKnownFolder_Release(kf_parent); + } + } + + CoTaskMemFree(ikf_path); + CoTaskMemFree(gkfp_path); + } FreeKnownFolderDefinitionFields(&kfd); } - IKnownFolder_Release(folder); + IKnownFolder_Release(folder); } break; -- 2.31.1

2 2

[PATCH 2/2] ntdll: Validate directory path when the path name ends with a dos device name.
by Akihiro Sagawa 19 Jun '21

19 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51291 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/path.c | 91 +++++++++++++++++++++++++++++++++++------ dlls/ntdll/tests/path.c | 2 - 2 files changed, 78 insertions(+), 15 deletions(-)

1 0

[PATCH 1/2] ntdll/tests: Expand path name tests with path + device name.
by Akihiro Sagawa 19 Jun '21

19 Jun '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/tests/path.c | 44 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-)

1 0

Wine staging 6.11 release
by Alistair Leslie-Hughes 19 Jun '21

19 Jun '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.11 (578 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * msvcrt: Calculate sinh/cosh/exp/pow with higher precision. * ntdll: Do not allow to deallocate thread stack for current thread. Added: * None Updated: * Various patchsets to remove compiler warnings. Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v5 1/6] jscript: Factor local_ref_scopes_t structure out of function_code_t.
by Paul Gofman 18 Jun '21

18 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/compile.c | 14 +++++++++----- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/engine.h | 9 +++++++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2a17639641f..46efd53cdb5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2379,10 +2379,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); - if(!func->locals) + func->local_scope_count = 1; + func->local_scopes = compiler_alloc(ctx->code, func->local_scope_count * sizeof(*func->local_scopes)); + if(!func->local_scopes) return E_OUTOFMEMORY; - func->locals_cnt = ctx->locals_cnt; + func->local_scopes[0].locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->local_scopes[0].locals)); + if(!func->local_scopes[0].locals) + return E_OUTOFMEMORY; + func->local_scopes[0].locals_cnt = ctx->locals_cnt; func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) @@ -2390,8 +2394,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, i = 0; WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) { - func->locals[i].name = local->name; - func->locals[i].ref = local->ref; + func->local_scopes[0].locals[i].name = local->name; + func->local_scopes[0].locals[i].ref = local->ref; if(local->ref >= 0) { func->variables[local->ref].name = local->name; func->variables[local->ref].func_id = -1; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e0a6e10e98b..c6ca3a9c10d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -578,13 +578,12 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame, BO frame->base_scope->frame = NULL; - for(i = 0; i < frame->function->locals_cnt; i++) { - hres = jsdisp_propput_name(frame->variable_obj, frame->function->locals[i].name, - ctx->stack[local_off(frame, frame->function->locals[i].ref)]); + for(i = 0; i < frame->function->local_scopes[0].locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->local_scopes[0].locals[i].name, + ctx->stack[local_off(frame, frame->function->local_scopes[0].locals[i].ref)]); if(FAILED(hres)) return hres; } - return S_OK; } @@ -630,7 +629,8 @@ static int __cdecl local_ref_cmp(const void *key, const void *ref) local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) { - return bsearch(identifier, function->locals, function->locals_cnt, sizeof(*function->locals), local_ref_cmp); + return bsearch(identifier, function->local_scopes[0].locals, function->local_scopes[0].locals_cnt, + sizeof(*function->local_scopes[0].locals), local_ref_cmp); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 442e7334c41..a94f1f211e4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -147,6 +147,11 @@ typedef struct { #define INVALID_LOCAL_REF 0x7fffffff +typedef struct { + unsigned locals_cnt; + local_ref_t *locals; +} local_ref_scopes_t; + typedef struct _function_code_t { BSTR name; int local_ref; @@ -168,8 +173,8 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; - unsigned locals_cnt; - local_ref_t *locals; + local_ref_scopes_t *local_scopes; + unsigned local_scope_count; bytecode_t *bytecode; } function_code_t; -- 2.31.1

3 15

[PATCH 1/2] mfplay: Create media item on player creation, when url is specified.
by Nikolay Sivov 18 Jun '21

18 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 29 +++++++++++++++++++++++++++++ dlls/mfplay/tests/mfplay.c | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f6cb81de436..0bbe59f4c90 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1911,14 +1911,26 @@ static const IMFAsyncCallbackVtbl media_player_session_events_callback_vtbl = media_player_session_events_callback_Invoke, }; +/*********************************************************************** + * MFPCreateMediaPlayer (mfplay.@) + */ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; + IMFPMediaItem *item; HRESULT hr; TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); + if (!player) + return E_POINTER; + + *player = NULL; + + if (!url && start_playback) + return E_INVALIDARG; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1950,6 +1962,23 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C 0, mfplay_instance, NULL); } + if (url) + { + if (FAILED(hr = media_player_create_item_from_url(object, url, TRUE, 0, &item))) + { + WARN("Failed to create media item, hr %#x.\n", hr); + goto failed; + } + + hr = IMFPMediaPlayer_SetMediaItem(&object->IMFPMediaPlayer_iface, item); + IMFPMediaItem_Release(item); + if (FAILED(hr)) + { + WARN("Failed to set media item, hr %#x.\n", hr); + goto failed; + } + } + *player = &object->IMFPMediaPlayer_iface; return S_OK; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index f11973ef939..a2d6da54f3e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -87,6 +87,26 @@ static void test_create_player(void) HWND window; HRESULT hr; + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + player = (void *)0xdeadbeef; + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!player, "Unexpected pointer %p.\n", player); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, &player); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, &callback, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.30.2

1 1

[PATCH 1/6] wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
by Zebediah Figura 18 Jun '21

18 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is scuffed, but ultimately this code path should go away anyway, and be replaced by an unconditional update_sub_resource. dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12d038c0120..6cfeb4f510d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address bo; struct wined3d_box box; if (buffer->flags & WINED3D_BUFFER_USE_BO) @@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, } else { - wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); - memcpy(bo.addr, data->data, resource->size); + memcpy(buffer->resource.heap_memory, data->data, resource->size); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); } -- 2.30.2

3 7

[PATCH vkd3d 1/5] vkd3d-shader: Write SM1 subtraction instructions.
by Zebediah Figura 18 Jun '21

18 Jun '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index afa096b0..7395772f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1733,6 +1733,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_IR_BINOP_SUB: + write_sm1_binary_op(ctx, buffer, D3DSIO_SUB, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_IR_UNOP_NEG: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG); break; -- 2.31.1

4 16

[PATCH] winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
by Brendan Shanks 18 Jun '21

18 Jun '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Also remove the check for AudioToolbox/AudioConverter.h, the only user of that macro was removed in d9ed4ee992b0b277dacf87d05cc0b69bcd06b90c ("l3codeca.acm: Remove the Mac OS AudioToolbox backend.") configure.ac | 18 ++---------------- dlls/winecoreaudio.drv/audiounit.c | 20 -------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ---------------------- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index ade04399af0..f76dd047825 100644 --- a/configure.ac +++ b/configure.ac @@ -431,9 +431,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -800,21 +797,10 @@ case $host_os in AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") - else - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - fi + AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - dnl Check for the AUGraphAddNode function - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - AC_CHECK_FUNCS(AUGraphAddNode) - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index a3c190870ad..030ff4d090a 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,9 +22,6 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -#include <CoreServices/CoreServices.h> -#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -50,23 +47,6 @@ #include "coreaudio.h" #include "wine/debug.h" -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager types for compatibility's sake */ -typedef ComponentDescription AudioComponentDescription; -#endif - -#ifndef HAVE_AUGRAPHADDNODE -static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) -{ - return AUGraphNewNode(graph, desc, 0, NULL, node); -} - -static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) -{ - return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); -} -#endif - WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bc153d92511..f07f4bae5fb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -72,28 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for OSX 10.5 */ -typedef Component AudioComponent; -typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} -#endif - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; -- 2.31.1

2 1