Merge pull request SoftEtherVPN#1905 from chipitsine/master

fix windows build
geneanet · Sep 17, 2023 · 18dc262 · 18dc262
2 parents d8dec75 + f736d18
commit 18dc262
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c
@@ -113,9 +113,12 @@ bool SwCompileSfx(LIST *o, wchar_t *dst_filename)
 	}
 
 	// 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");
 	_UpdateResourceA = (UINT (__stdcall *)(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD))GetProcAddress(hKernel32, "UpdateResourceA");
 	_EndUpdateResourceW = (UINT (__stdcall *)(HANDLE,UINT))GetProcAddress(hKernel32, "EndUpdateResourceW");
+    #pragma clang diagnostic pop
 
 	if (_BeginUpdateResourceW != NULL && _UpdateResourceA != NULL && _EndUpdateResourceW != NULL)
 	{
@@ -647,7 +650,10 @@ UINT SWExec()
 	bool is_datafile_exists = false;
 
 	// 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));
+    #pragma clang diagnostic pop
 
 	if (is_datafile_exists)
 	{

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

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

diff --git a/src/Mayaqua/Win32.c b/src/Mayaqua/Win32.c
@@ -2846,7 +2846,10 @@ bool Win32InitThread(THREAD *t)
 
 	// Thread creation
 	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);
+    #pragma clang diagnostic pop
 	if (hThread == NULL)
 	{
 		// Thread creation failure

diff --git a/src/vpndrvinst/main.c b/src/vpndrvinst/main.c
@@ -2,6 +2,7 @@
 #include "Dialog.h"
 
 #include <stdio.h>
+#include <string.h>
 
 void ShowUsage()
 {