mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-02-09 04:30:09 +00:00
LV2 Client: Use unicode consistently for filepaths on Windows
This commit is contained in:
parent
1fcaf709ca
commit
ba604f4ced
3 changed files with 97 additions and 8 deletions
|
|
@ -25,11 +25,19 @@
|
|||
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <vector>
|
||||
|
||||
#ifdef _WIN32
|
||||
#undef UNICODE
|
||||
#undef _UNICODE
|
||||
|
||||
#define UNICODE 1
|
||||
#define _UNICODE 1
|
||||
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
HMODULE dlopen (const char* filename, int) { return LoadLibrary (filename); }
|
||||
HMODULE dlopen (const TCHAR* filename, int) { return LoadLibrary (filename); }
|
||||
FARPROC dlsym (HMODULE handle, const char* name) { return GetProcAddress (handle, name); }
|
||||
void printError()
|
||||
{
|
||||
|
|
@ -44,12 +52,61 @@
|
|||
numElements - 1,
|
||||
nullptr);
|
||||
|
||||
_tprintf ("%s", messageBuffer);
|
||||
_tprintf (_T ("%s"), messageBuffer);
|
||||
}
|
||||
|
||||
enum { RTLD_LAZY = 0 };
|
||||
|
||||
class ArgList
|
||||
{
|
||||
public:
|
||||
ArgList (int, const char**) {}
|
||||
ArgList (const ArgList&) = delete;
|
||||
ArgList (ArgList&&) = delete;
|
||||
ArgList& operator= (const ArgList&) = delete;
|
||||
ArgList& operator= (ArgList&&) = delete;
|
||||
~ArgList() { LocalFree (argv); }
|
||||
|
||||
LPWSTR get (int i) const { return argv[i]; }
|
||||
|
||||
int size() const { return argc; }
|
||||
|
||||
private:
|
||||
int argc = 0;
|
||||
LPWSTR* argv = CommandLineToArgvW (GetCommandLineW(), &argc);
|
||||
};
|
||||
|
||||
std::vector<char> toUTF8 (const TCHAR* str)
|
||||
{
|
||||
const auto numBytes = WideCharToMultiByte (CP_UTF8, 0, str, -1, nullptr, 0, nullptr, nullptr);
|
||||
std::vector<char> result (numBytes);
|
||||
WideCharToMultiByte (CP_UTF8, 0, str, -1, result.data(), static_cast<int> (result.size()), nullptr, nullptr);
|
||||
return result;
|
||||
}
|
||||
|
||||
#else
|
||||
#include <dlfcn.h>
|
||||
void printError() { printf ("%s\n", dlerror()); }
|
||||
class ArgList
|
||||
{
|
||||
public:
|
||||
ArgList (int argcIn, const char** argvIn) : argc (argcIn), argv (argvIn) {}
|
||||
ArgList (const ArgList&) = delete;
|
||||
ArgList (ArgList&&) = delete;
|
||||
ArgList& operator= (const ArgList&) = delete;
|
||||
ArgList& operator= (ArgList&&) = delete;
|
||||
~ArgList() = default;
|
||||
|
||||
const char* get (int i) const { return argv[i]; }
|
||||
|
||||
int size() const { return argc; }
|
||||
|
||||
private:
|
||||
int argc = 0;
|
||||
const char** argv = nullptr;
|
||||
};
|
||||
|
||||
std::vector<char> toUTF8 (const char* str) { return std::vector<char> (str, str + std::strlen (str) + 1); }
|
||||
#endif
|
||||
|
||||
// Replicating part of the LV2 header here so that we don't have to set up any
|
||||
|
|
@ -74,10 +131,12 @@ extern "C"
|
|||
|
||||
int main (int argc, const char** argv)
|
||||
{
|
||||
if (argc != 2)
|
||||
const ArgList argList { argc, argv };
|
||||
|
||||
if (argList.size() != 2)
|
||||
return 1;
|
||||
|
||||
const auto* libraryPath = argv[1];
|
||||
const auto* libraryPath = argList.get (1);
|
||||
|
||||
struct RecallFeature
|
||||
{
|
||||
|
|
@ -87,11 +146,22 @@ int main (int argc, const char** argv)
|
|||
if (auto* handle = dlopen (libraryPath, RTLD_LAZY))
|
||||
{
|
||||
if (auto* getDescriptor = reinterpret_cast<const LV2_Descriptor* (*) (uint32_t)> (dlsym (handle, "lv2_descriptor")))
|
||||
{
|
||||
if (auto* descriptor = getDescriptor (0))
|
||||
{
|
||||
if (auto* extensionData = descriptor->extension_data)
|
||||
{
|
||||
if (auto* recallFeature = reinterpret_cast<const RecallFeature*> (extensionData ("https://lv2-extensions.juce.com/turtle_recall")))
|
||||
{
|
||||
if (auto* doRecall = recallFeature->doRecall)
|
||||
return doRecall (libraryPath);
|
||||
{
|
||||
const auto converted = toUTF8 (libraryPath);
|
||||
return doRecall (converted.data());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue