videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

win32: dirs: factorize common code to get VLC folders 

These functions use the same code on both variants of Windows:
- config_GetSysPath()
- config_GetLibDir()

These functions are not the same:
- platform_GetUserDir()

They are all internal to the core.
mmdevice-clean/8
Steve Lhomme 2 months ago
parent
f16d1f3c12
commit
e58becdefb
5 changed files with 119 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/Makefile.am
  2. 1
      src/meson.build
  3. 117
      src/win32/dirs-common.c
  4. 90
      src/win32/dirs-uap.c
  5. 90
      src/win32/dirs.c

1
src/Makefile.am
View File

@ -448,6 +448,7 @@ libvlccore_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_libvlccore)
if HAVE_WIN32
libvlccore_la_SOURCES += \
win32/dirs-common.c \
win32/error.c \
win32/filesystem.c \
win32/netconf.c \

1
src/meson.build
View File

@ -341,6 +341,7 @@ if host_system == 'darwin'
endif
elif host_system == 'windows'
libvlccore_sources += [
'win32/dirs-common.c',
'win32/error.c',
'win32/filesystem.c',
'win32/netconf.c',

117
src/win32/dirs-common.c
View File

@ -0,0 +1,117 @@
/*****************************************************************************
* dirs-common.c: directories configuration
*****************************************************************************
* Copyright (C) 2001-2010 VLC authors and VideoLAN
* Copyright © 2007-2012 Rémi Denis-Courmont
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_charset.h> // FromWide
#include "../config/configuration.h"
#include <windows.h>
#include <assert.h>
char *config_GetLibDir (void)
{
/* Get our full path */
MEMORY_BASIC_INFORMATION mbi;
if (!VirtualQuery (config_GetLibDir, &mbi, sizeof(mbi)))
goto error;
wchar_t wpath[MAX_PATH];
if (!GetModuleFileNameW ((HMODULE) mbi.AllocationBase, wpath, MAX_PATH))
goto error;
wchar_t *file = wcsrchr (wpath, L'\\');
if (file == NULL)
goto error;
*file = L'\0';
return FromWide (wpath);
error:
abort ();
}
static char *config_GetLibexecDir (void)
{
wchar_t wpath[MAX_PATH];
if (!GetModuleFileNameW (NULL, wpath, MAX_PATH))
goto error;
wchar_t *file = wcsrchr (wpath, L'\\');
if (file == NULL)
goto error;
*file = L'\0';
return FromWide (wpath);
error:
abort ();
}
static char *config_GetDataDir(void)
{
const char *path = getenv ("VLC_DATA_PATH");
return (path != NULL) ? strdup (path) : config_GetLibDir ();
}
char *config_GetSysPath(vlc_sysdir_t type, const char *filename)
{
char *dir = NULL;
switch (type)
{
case VLC_PKG_DATA_DIR:
dir = config_GetDataDir();
break;
case VLC_PKG_LIB_DIR:
dir = getenv ("VLC_LIB_PATH");
if (dir)
return strdup( dir );
dir = config_GetLibDir();
break;
case VLC_PKG_LIBEXEC_DIR:
dir = getenv ("VLC_LIBEXEC_PATH");
if (dir)
return strdup( dir );
dir = config_GetLibexecDir();
break;
case VLC_SYSDATA_DIR:
break;
case VLC_LOCALE_DIR:
dir = config_GetSysPath(VLC_PKG_DATA_DIR, "locale");
break;
default:
vlc_assert_unreachable();
}
if (filename == NULL || unlikely(dir == NULL))
return dir;
char *path;
if (unlikely(asprintf(&path, "%s\\%s", dir, filename) == -1))
path = NULL;
free(dir);
return path;
}

90
src/win32/dirs-uap.c
View File

@ -28,11 +28,7 @@
#define COBJMACROS
#define INITGUID
#ifndef UNICODE
#define UNICODE
#endif
#include <vlc_common.h>
#include <vlc_configuration.h>
#include "../config/configuration.h"
#include <vlc_charset.h>
@ -153,92 +149,6 @@ end_other:
return GetFolderName(folder);
}
char *config_GetLibDir (void)
{
/* Get our full path */
MEMORY_BASIC_INFORMATION mbi;
if (!VirtualQuery (config_GetLibDir, &mbi, sizeof(mbi)))
goto error;
wchar_t wpath[MAX_PATH];
if (!GetModuleFileNameW ((HMODULE) mbi.AllocationBase, wpath, MAX_PATH))
goto error;
wchar_t *file = wcsrchr (wpath, L'\\');
if (file == NULL)
goto error;
*file = L'\0';
return FromWide (wpath);
error:
abort ();
}
static char *config_GetLibexecDir (void)
{
wchar_t wpath[MAX_PATH];
if (!GetModuleFileNameW (NULL, wpath, MAX_PATH))
goto error;
wchar_t *file = wcsrchr (wpath, L'\\');
if (file == NULL)
goto error;
*file = L'\0';
return FromWide (wpath);
error:
abort ();
}
static char *config_GetDataDir(void)
{
const char *path = getenv ("VLC_DATA_PATH");
return (path != NULL) ? strdup (path) : config_GetLibDir ();
}
char *config_GetSysPath(vlc_sysdir_t type, const char *filename)
{
char *dir = NULL;
switch (type)
{
case VLC_PKG_DATA_DIR:
dir = config_GetDataDir();
break;
case VLC_PKG_LIB_DIR:
dir = getenv ("VLC_LIB_PATH");
if (dir)
return strdup( dir );
dir = config_GetLibDir();
break;
case VLC_PKG_LIBEXEC_DIR:
dir = getenv ("VLC_LIBEXEC_PATH");
if (dir)
return strdup( dir );
dir = config_GetLibexecDir();
break;
case VLC_SYSDATA_DIR:
return NULL;
case VLC_LOCALE_DIR:
dir = config_GetSysPath(VLC_PKG_DATA_DIR, "locale");
break;
default:
vlc_assert_unreachable();
}
if (unlikely(dir == NULL))
return NULL;
if (filename == NULL)
return dir;
char *path;
if (unlikely(asprintf(&path, "%s\\%s", dir, filename) == -1))
path = NULL;
free(dir);
return path;
}
static char *config_GetAppDir (void)
{
char *psz_dir = NULL;

90
src/win32/dirs.c
View File

@ -25,105 +25,15 @@
# include "config.h"
#endif
#ifndef UNICODE
#define UNICODE
#endif
#include <vlc_common.h>
#include <direct.h>
#include <shlobj.h>
#include "../libvlc.h"
#include <vlc_charset.h>
#include <vlc_configuration.h>
#include "../config/configuration.h"
#include <assert.h>
#include <limits.h>
char *config_GetLibDir (void)
{
/* Get our full path */
MEMORY_BASIC_INFORMATION mbi;
if (!VirtualQuery (config_GetLibDir, &mbi, sizeof(mbi)))
goto error;
wchar_t wpath[MAX_PATH];
if (!GetModuleFileName ((HMODULE) mbi.AllocationBase, wpath, MAX_PATH))
goto error;
wchar_t *file = wcsrchr (wpath, L'\\');
if (file == NULL)
goto error;
*file = L'\0';
return FromWide (wpath);
error:
abort ();
}
static char *config_GetLibexecDir (void)
{
wchar_t wpath[MAX_PATH];
if (!GetModuleFileNameW (NULL, wpath, MAX_PATH))
goto error;
wchar_t *file = wcsrchr (wpath, L'\\');
if (file == NULL)
goto error;
*file = L'\0';
return FromWide (wpath);
error:
abort ();
}
static char *config_GetDataDir(void)
{
const char *path = getenv ("VLC_DATA_PATH");
return (path != NULL) ? strdup (path) : config_GetLibDir ();
}
char *config_GetSysPath(vlc_sysdir_t type, const char *filename)
{
char *dir = NULL;
switch (type)
{
case VLC_PKG_DATA_DIR:
dir = config_GetDataDir();
break;
case VLC_PKG_LIB_DIR:
dir = getenv ("VLC_LIB_PATH");
if (dir)
return strdup( dir );
dir = config_GetLibDir();
break;
case VLC_PKG_LIBEXEC_DIR:
dir = getenv ("VLC_LIBEXEC_PATH");
if (dir)
return strdup( dir );
dir = config_GetLibexecDir();
break;
case VLC_SYSDATA_DIR:
break;
case VLC_LOCALE_DIR:
dir = config_GetSysPath(VLC_PKG_DATA_DIR, "locale");
break;
default:
vlc_assert_unreachable();
}
if (filename == NULL || unlikely(dir == NULL))
return dir;
char *path;
if (unlikely(asprintf(&path, "%s\\%s", dir, filename) == -1))
path = NULL;
free(dir);
return path;
}
static char *config_GetKnownFolder (KNOWNFOLDERID id)
{

Write Preview
Loading…
Cancel
Save