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

Merge pull request #1905 from chipitsine/master

Browse Source 
fix windows build
This commit is contained in:
Ilya Shipitsin 2023-09-17 21:02:58 +02:00 committed by GitHub
commit 18dc2621ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cedar/SW.c
View File

@ -113,9 +113,12 @@ bool SwCompileSfx(LIST *o, wchar_t *dst_filename)
} }
// Get the API related to the resource editing // Get the API related to the resource editing
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
_BeginUpdateResourceW = (HANDLE (__stdcall *)(LPCWSTR,UINT))GetProcAddress(hKernel32, "BeginUpdateResourceW"); _BeginUpdateResourceW = (HANDLE (__stdcall *)(LPCWSTR,UINT))GetProcAddress(hKernel32, "BeginUpdateResourceW");
_UpdateResourceA = (UINT (__stdcall *)(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD))GetProcAddress(hKernel32, "UpdateResourceA"); _UpdateResourceA = (UINT (__stdcall *)(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD))GetProcAddress(hKernel32, "UpdateResourceA");
_EndUpdateResourceW = (UINT (__stdcall *)(HANDLE,UINT))GetProcAddress(hKernel32, "EndUpdateResourceW"); _EndUpdateResourceW = (UINT (__stdcall *)(HANDLE,UINT))GetProcAddress(hKernel32, "EndUpdateResourceW");
#pragma clang diagnostic pop
if (_BeginUpdateResourceW != NULL && _UpdateResourceA != NULL && _EndUpdateResourceW != NULL) if (_BeginUpdateResourceW != NULL && _UpdateResourceA != NULL && _EndUpdateResourceW != NULL)
{ {
@ -647,7 +650,10 @@ UINT SWExec()
bool is_datafile_exists = false; bool is_datafile_exists = false;
// Examine whether DATAFILE resources are stored in setup.exe that is currently running // Examine whether DATAFILE resources are stored in setup.exe that is currently running
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
EnumResourceNamesA(NULL, SW_SFX_RESOURCE_TYPE, SwEnumResourceNamesProc, (LONG_PTR)(&is_datafile_exists)); EnumResourceNamesA(NULL, SW_SFX_RESOURCE_TYPE, SwEnumResourceNamesProc, (LONG_PTR)(&is_datafile_exists));
#pragma clang diagnostic pop
if (is_datafile_exists) if (is_datafile_exists)
{ {

3
src/Cedar/SeLowUser.c
View File

@ -93,9 +93,12 @@ void SuDeleteGarbageInfsInner()
return; return;
} }
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
_SetupUninstallOEMInfA = _SetupUninstallOEMInfA =
(UINT (__stdcall *)(PCSTR,DWORD,PVOID)) (UINT (__stdcall *)(PCSTR,DWORD,PVOID))
GetProcAddress(hSetupApiDll, "SetupUninstallOEMInfA"); GetProcAddress(hSetupApiDll, "SetupUninstallOEMInfA");
#pragma clang diagnostic pop
if (_SetupUninstallOEMInfA != NULL) if (_SetupUninstallOEMInfA != NULL)
{ {

6
src/Cedar/WinUi.c
View File

@ -903,7 +903,10 @@ void ShowWizard(HWND hWndParent, WIZARD *w, UINT start_id)
h.phpage = (HPROPSHEETPAGE *)pages_array; h.phpage = (HPROPSHEETPAGE *)pages_array;
h.pszbmHeader = MAKEINTRESOURCEW(w->Bitmap); h.pszbmHeader = MAKEINTRESOURCEW(w->Bitmap);
h.pszCaption = w->Caption; h.pszCaption = w->Caption;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
h.pfnCallback = WizardDlgProc; h.pfnCallback = WizardDlgProc;
#pragma clang diagnostic pop
start_page = GetWizardPage(w, start_id); start_page = GetWizardPage(w, start_id);
if (start_page != NULL) if (start_page != NULL)
@ -3487,7 +3490,10 @@ HWND SearchWindow(wchar_t *caption)
p.caption = caption; p.caption = caption;
p.hWndFound = NULL; p.hWndFound = NULL;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
EnumWindows(SearchWindowEnumProc, (LPARAM)&p); EnumWindows(SearchWindowEnumProc, (LPARAM)&p);
#pragma clang diagnostic pop
return p.hWndFound; return p.hWndFound;
} }

3
src/Mayaqua/Win32.c
View File

@ -2846,7 +2846,10 @@ bool Win32InitThread(THREAD *t)
// Thread creation // Thread creation
t->pData = w; t->pData = w;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
hThread = (HANDLE)_beginthreadex(NULL, 0, Win32DefaultThreadProc, info, 0, &thread_id); hThread = (HANDLE)_beginthreadex(NULL, 0, Win32DefaultThreadProc, info, 0, &thread_id);
#pragma clang diagnostic pop
if (hThread == NULL) if (hThread == NULL)
{ {
// Thread creation failure // Thread creation failure

1
src/vpndrvinst/main.c
View File

@ -2,6 +2,7 @@
#include "Dialog.h" #include "Dialog.h"
#include <stdio.h> #include <stdio.h>
#include <string.h>
void ShowUsage() void ShowUsage()
{ {