Skip to content

Fix CoreAudio DLL path not being found (on newer Wine?) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
udf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix CoreAudio DLL path not being found (on newer Wine?) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/encoder/coreaudioconnect/connector/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ OBJECTS = dllinterface.o main.o
BINARY = $(BOCA_PATH)/$(BINDIR)/boca_$(TYPE)_$(TARGET)$(X64).$(VERSION)$(EXECUTABLE)

DEFINE = -DUNICODE
LIBS = -lole32 -lshell32
LIBS = -lole32 -lshell32 -lshlwapi

CCOPTS = -Wno-multichar -I"$(SRCDIR)"/$(BOCA_PATH)/include -I"$(SRCDIR)"/$(BOCA_PATH)/include/support/apple $(DEFINE)
LDOPTS = -L $(BOCA_PATH)/$(LIBDIR) $(LIBS)
Expand Down
28 changes: 10 additions & 18 deletions components/encoder/coreaudioconnect/connector/dllinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <stdio.h>
#include <wchar.h>
#include <shlobj.h>
#include <shlwapi.h>

#ifdef __WINE__
# include <unistd.h>
Expand Down Expand Up @@ -45,6 +46,7 @@
# define SetDllDirectoryW SetDllDirectoryA
# define LoadLibraryW LoadLibraryA

# define PathFileExistsW PathFileExistsA
# define FindFirstFileW FindFirstFileA
# define FindNextFileW FindNextFileA
# define DeleteFileW DeleteFileA
Expand Down Expand Up @@ -82,16 +84,6 @@ HINSTANCE coreaudiodll = NULL;

#define PATH_LENGTH 2048

static bool FileSystemEntryExists(const wchar_t *path)
{
WIN32_FIND_DATAW findData;
HANDLE handle = FindFirstFileW(path, &findData);

FindClose(handle);

return (handle != INVALID_HANDLE_VALUE);
}

static const wchar_t *GetSystemDirectory(int id)
{
static wchar_t commonFilesDir[PATH_LENGTH] = { 0 };
Expand Down Expand Up @@ -152,7 +144,7 @@ static const wchar_t *GetCacheFolder(const char *applicationPrefix)

fclose(_wfopen(cacheFolder, wstring("w")));

if (FileSystemEntryExists(cacheFolder))
if (PathFileExistsW(cacheFolder))
{
DeleteFileW(cacheFolder);

Expand Down Expand Up @@ -222,7 +214,7 @@ static void FindDependenciesFolders(const wchar_t *packageFolder, wchar_t **pack
wcscpy(manifestPath, packageFolder);
wcscat(manifestPath, wstring("AppxManifest.xml"));

if (!FileSystemEntryExists(manifestPath)) return;
if (!PathFileExistsW(manifestPath)) return;

/* Load app manifest.
*/
Expand Down Expand Up @@ -351,15 +343,15 @@ static void CopyLibrary(const wchar_t *libName, wchar_t **packageFolders, const
wcscpy(libFile, packageFolders[i]);
wcscat(libFile, libName);

if (!FileSystemEntryExists(libFile)) continue;
if (!PathFileExistsW(libFile)) continue;

wcscpy(sourceFile, libFile);
}

/* Check file existence and skip already existing files.
*/
if (!FileSystemEntryExists(sourceFile) ||
FileSystemEntryExists(targetFile)) return;
if (!PathFileExistsW(sourceFile) ||
PathFileExistsW(targetFile)) return;

/* Prepare input and output files.
*/
Expand Down Expand Up @@ -443,7 +435,7 @@ static void CacheCoreAudioLibraries(const wchar_t *cacheFolder)
wcscpy(packageIdFile, cacheFolder);
wcscat(packageIdFile, wstring("PackageId"));

if (FileSystemEntryExists(packageIdFile))
if (PathFileExistsW(packageIdFile))
{
FILE *in = _wfopen(packageIdFile, wstring("r"));
char line[256] = { 0 };
Expand Down Expand Up @@ -497,13 +489,13 @@ bool LoadCoreAudioDLL(const char *applicationPrefix)
wcscpy(coreAudioDir, GetSystemDirectory(CSIDL_PROGRAM_FILES_COMMON));
wcscat(coreAudioDir, wstring("Apple\\Apple Application Support\\"));

if (!FileSystemEntryExists(coreAudioDir))
if (!PathFileExistsW(coreAudioDir))
{
wcscpy(coreAudioDir, GetSystemDirectory(CSIDL_PROGRAM_FILES));
wcscat(coreAudioDir, wstring("iTunes\\"));
}

if (!FileSystemEntryExists(coreAudioDir))
if (!PathFileExistsW(coreAudioDir))
{
wcscpy(coreAudioDir, GetCacheFolder(applicationPrefix));
wcscat(coreAudioDir, wstring("boca.encoder.coreaudio\\"));
Expand Down