mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-11-22 17:39:53 +03:00
temporarily suppress clang warnings on "-Wincompatible-function-pointer-types"
This commit is contained in:
parent
1be55ebb94
commit
f736d18267
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user