AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Mayaqua: remove all references to binaries with "_x64" and "_ia64" suffix

Browse Source 
See the previous commit's message for details.
This commit is contained in:
Davide Beatrici 2020-07-27 07:25:00 +02:00
parent a3eb115b0a
commit 6a472d827a
4 changed files with 8 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cedar/WinUi.c
View File

@ -10112,11 +10112,11 @@ void InitWinUi(wchar_t *software_name, char *font, UINT fontsize)
{ {
if (Is64()) if (Is64())
{ {
hDll = MsLoadLibraryAsDataFile(MsGetPenCoreDllFileName()); hDll = MsLoadLibraryAsDataFile(PENCORE_DLL_NAME);
} }
else else
{ {
hDll = MsLoadLibrary(MsGetPenCoreDllFileName()); hDll = MsLoadLibrary(PENCORE_DLL_NAME);
} }
if (hDll == NULL) if (hDll == NULL)

4
src/Mayaqua/Mayaqua.h
View File

@ -12,11 +12,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
// PenCore.dll related
#define PENCORE_DLL_NAME "|PenCore.dll" #define PENCORE_DLL_NAME "|PenCore.dll"
// #define PENCORE_DLL_NAME_X64 "|PenCore_x64.dll" // commonized to x86
// #define PENCORE_DLL_NAME_IA64 "|PenCore_ia64.dll" // commonized to x86
//#define USE_PROBE // Use Probe //#define USE_PROBE // Use Probe

46
src/Mayaqua/Microsoft.c
View File

@ -2098,7 +2098,6 @@ bool MsExecDriverInstaller(char *arg)
HANDLE h; HANDLE h;
UINT retcode; UINT retcode;
SHELLEXECUTEINFOW info; SHELLEXECUTEINFOW info;
wchar_t *src_exe;
wchar_t *arg_w; wchar_t *arg_w;
// Validate arguments // Validate arguments
if (arg == NULL) if (arg == NULL)
@ -2110,20 +2109,9 @@ bool MsExecDriverInstaller(char *arg)
UniFormat(hamcore_src, sizeof(hamcore_src), L"%s\\hamcore.se2", MsGetExeDirNameW()); UniFormat(hamcore_src, sizeof(hamcore_src), L"%s\\hamcore.se2", MsGetExeDirNameW());
// Extract the File // Extract the File
src_exe = VISTA_DRIVER_INSTALLER_SRC;
if (MsIsX64())
{
src_exe = VISTA_DRIVER_INSTALLER_SRC_X64;
}
if (MsIsIA64())
{
src_exe = VISTA_DRIVER_INSTALLER_SRC_IA64;
}
UniFormat(tmp, sizeof(tmp), VISTA_DRIVER_INSTALLER_DST, MsGetMyTempDirW()); UniFormat(tmp, sizeof(tmp), VISTA_DRIVER_INSTALLER_DST, MsGetMyTempDirW());
if (FileCopyW(src_exe, tmp) == false) if (FileCopyW(VISTA_DRIVER_INSTALLER_SRC, tmp) == false)
{ {
return false; return false;
} }
@ -3938,26 +3926,6 @@ LRESULT CALLBACK MsUserModeWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
return DefWindowProc(hWnd, msg, wParam, lParam); return DefWindowProc(hWnd, msg, wParam, lParam);
} }
// Get the name of PenCore.dll
char *MsGetPenCoreDllFileName()
{
/*if (Is64())
{
if (IsX64())
{
return PENCORE_DLL_NAME_X64;
}
else
{
return PENCORE_DLL_NAME_IA64;
}
}
else*/
{
return PENCORE_DLL_NAME;
}
}
// Get whether this instance is in user mode // Get whether this instance is in user mode
bool MsIsUserMode() bool MsIsUserMode()
{ {
@ -4304,11 +4272,11 @@ void MsUserModeW(wchar_t *title, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop
if (Is64()) if (Is64())
{ {
hDll = MsLoadLibraryAsDataFile(MsGetPenCoreDllFileName()); hDll = MsLoadLibraryAsDataFile(PENCORE_DLL_NAME);
} }
else else
{ {
hDll = MsLoadLibrary(MsGetPenCoreDllFileName()); hDll = MsLoadLibrary(PENCORE_DLL_NAME);
} }
// Read icon // Read icon
@ -4877,15 +4845,7 @@ UINT MsService(char *name, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT
wchar_t filename[MAX_PATH]; wchar_t filename[MAX_PATH];
UniFormat(filename, sizeof(filename), L"\"%s\"", arg_w); UniFormat(filename, sizeof(filename), L"\"%s\"", arg_w);
if (Is64() == false)
{
UniFormat(vpncmgr, sizeof(vpncmgr), L"%s\\vpncmgr.exe", MsGetExeDirNameW()); UniFormat(vpncmgr, sizeof(vpncmgr), L"%s\\vpncmgr.exe", MsGetExeDirNameW());
}
else
{
UniFormat(vpncmgr, sizeof(vpncmgr), L"%s\\vpncmgr_x64.exe", MsGetExeDirNameW());
}
RunW(vpncmgr, filename, false, false); RunW(vpncmgr, filename, false, false);
} }

3
src/Mayaqua/Microsoft.h
View File

@ -134,8 +134,6 @@ typedef void *HWND;
// Vista driver installer related // Vista driver installer related
#define VISTA_DRIVER_INSTALLER_SRC L"|driver_installer.exe" #define VISTA_DRIVER_INSTALLER_SRC L"|driver_installer.exe"
#define VISTA_DRIVER_INSTALLER_SRC_X64 L"|driver_installer_x64.exe"
#define VISTA_DRIVER_INSTALLER_SRC_IA64 L"|driver_installer_ia64.exe"
#define VISTA_DRIVER_INSTALLER_DST L"%s\\driver_installer.exe" #define VISTA_DRIVER_INSTALLER_DST L"%s\\driver_installer.exe"
#define DRIVER_DEVICE_ID_TAG "NeoAdapter_%s" #define DRIVER_DEVICE_ID_TAG "NeoAdapter_%s"
@ -741,7 +739,6 @@ void MsServiceMode(SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop);
void MsUserModeW(wchar_t *title, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT icon); void MsUserModeW(wchar_t *title, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT icon);
bool MsIsUserMode(); bool MsIsUserMode();
void MsTestOnly(); void MsTestOnly();
char *MsGetPenCoreDllFileName();
void MsPlaySound(char *name); void MsPlaySound(char *name);
void MsSetThreadSingleCpu(); void MsSetThreadSingleCpu();
void MsWin9xTest(); void MsWin9xTest();