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

remove unused functions (identified by cppcheck)

Browse Source 
[src/Cedar/WinUi.c:7226]: (style) The function 'CbInsertStr' is never used.
[src/Cedar/WinUi.c:8922]: (style) The function 'DialogCreateEx' is never used.
[src/Cedar/WinUi.c:2150]: (style) The function 'EndFreeInfoDlg' is never used.
[src/Cedar/WinUi.c:2166]: (style) The function 'ExecuteHamcoreExe' is never used.
[src/Cedar/WinUi.c:9833]: (style) The function 'FormatTextA' is never used.
[src/Cedar/WinUi.c:9271]: (style) The function 'GetFontSize' is never used.
[src/Cedar/WinUi.c:9789]: (style) The function 'GetMonitorSize' is never used.
[src/Cedar/WinUi.c:10305]: (style) The function 'GetTextSize' is never used.
[src/Cedar/WinUi.c:9707]: (style) The function 'GetWindowClientRect' is never used.
[src/Cedar/WinUi.c:1130]: (style) The function 'GetWizardPageIndex' is never used.
[src/Cedar/WinUi.c:3950]: (style) The function 'IpClear' is never used.
[src/Cedar/WinUi.c:6837]: (style) The function 'LbAddStr' is never used.
[src/Cedar/WinUi.c:6810]: (style) The function 'LbFindStr' is never used.
[src/Cedar/WinUi.c:7050]: (style) The function 'LbGetSelect' is never used.
[src/Cedar/WinUi.c:6798]: (style) The function 'LbGetStr' is never used.
[src/Cedar/WinUi.c:6886]: (style) The function 'LbInsertStr' is never used.
[src/Cedar/WinUi.c:6998]: (style) The function 'LbSetHeight' is never used.
[src/Cedar/WinUi.c:3638]: (style) The function 'LedDrawRect' is never used.
[src/Cedar/WinUi.c:5986]: (style) The function 'LvGetMaskedNum' is never used.
[src/Cedar/WinUi.c:6023]: (style) The function 'LvSearchStr_' is never used.
[src/Cedar/WinUi.c:5689]: (style) The function 'LvSetItemImage' is never used.
[src/Cedar/WinUi.c:5817]: (style) The function 'LvShow' is never used.
[src/Cedar/WinUi.c:10103]: (style) The function 'NoTop' is never used.
[src/Cedar/WinUi.c:9995]: (style) The function 'NoticeSettingChange' is never used.
[src/Cedar/WinUi.c:7840]: (style) The function 'PkcsUtil' is never used.
[src/Cedar/WinUi.c:8954]: (style) The function 'SetBitmap' is never used.
[src/Cedar/WinUi.c:4525]: (style) The function 'SetMenuItemEnable' is never used.
[src/Cedar/WinUi.c:9866]: (style) The function 'SetTextEx' is never used.
[src/Cedar/WinUi.c:9888]: (style) The function 'SetTextExA' is never used.
[src/Cedar/WinUi.c:11220]: (style) The function 'SetWinUiTitle' is never used.
[src/Cedar/WinUi.c:2127]: (style) The function 'StartFreeInfoDlg' is never used.
[src/Cedar/WinUi.c:1554]: (style) The function 'WinConnectEx2' is never used.
This commit is contained in:
Ilya Shipitsin 2018-02-08 14:59:59 +05:00
parent 2883bda17d
commit 4ce858bf0c
2 changed files with 0 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

698
src/Cedar/WinUi.c
View File

@ -1126,25 +1126,6 @@ void FreeWizard(WIZARD *w)
Free(w); Free(w);
} }
// Get the index page of the wizard
UINT GetWizardPageIndex(WIZARD *w, UINT id)
{
WIZARD_PAGE *p;
// Validate arguments
if (w == NULL || id == 0)
{
return INFINITE;
}
p = GetWizardPage(w, id);
if (p == NULL)
{
return INFINITE;
}
return p->Index;
}
// Get the wizard page // Get the wizard page
WIZARD_PAGE *GetWizardPage(WIZARD *w, UINT id) WIZARD_PAGE *GetWizardPage(WIZARD *w, UINT id)
{ {
@ -1551,10 +1532,6 @@ UINT WinConnectDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *
} }
// TCP connection with showing the UI // TCP connection with showing the UI
SOCK *WinConnectEx2(HWND hWnd, char *server, UINT port, UINT timeout, UINT icon_id, wchar_t *caption, wchar_t *info, bool try_start_ssl, bool ssl_no_tls)
{
return WinConnectEx3(hWnd, server, port, timeout, icon_id, caption, info, NULL, false, try_start_ssl, ssl_no_tls);
}
SOCK *WinConnectEx3(HWND hWnd, char *server, UINT port, UINT timeout, UINT icon_id, wchar_t *caption, wchar_t *info, UINT *nat_t_error_code, char *nat_t_svc_name, bool try_start_ssl, bool ssl_no_tls) SOCK *WinConnectEx3(HWND hWnd, char *server, UINT port, UINT timeout, UINT icon_id, wchar_t *caption, wchar_t *info, UINT *nat_t_error_code, char *nat_t_svc_name, bool try_start_ssl, bool ssl_no_tls)
{ {
wchar_t tmp[MAX_SIZE]; wchar_t tmp[MAX_SIZE];
@ -2123,75 +2100,6 @@ void FreeInfoThread(THREAD *thread, void *param)
ShowFreeInfoDialog(NULL, info); ShowFreeInfoDialog(NULL, info);
} }
// Start the Free Edition Announcement dialog
FREEINFO *StartFreeInfoDlg(char *server_name)
{
FREEINFO *info;
if (IsRegistedToDontShowFreeEditionDialog(server_name))
{
return NULL;
}
info = ZeroMalloc(sizeof(FREEINFO));
StrCpy(info->ServerName, sizeof(info->ServerName), server_name);
info->Event = NewEvent();
info->Thread = NewThread(FreeInfoThread, info);
Wait(info->Event, INFINITE);
ReleaseEvent(info->Event);
info->Event = NULL;
return info;
}
// End the Free Edition Announcement dialog
void EndFreeInfoDlg(FREEINFO *info)
{
// Validate arguments
if (info == NULL)
{
return;
}
SendMsg(info->hWnd, 0, WM_CLOSE, 0, 0);
WaitThread(info->Thread, INFINITE);
ReleaseThread(info->Thread);
Free(info);
}
// Execute a EXE in the hamcore
bool ExecuteHamcoreExe(char *name)
{
BUF *b;
wchar_t tmp[MAX_PATH];
char tmp2[MAX_PATH];
UCHAR hash[MD5_SIZE];
// Validate arguments
if (name == NULL)
{
return false;
}
b = ReadDump(name);
if (b == NULL)
{
return false;
}
Hash(hash, name, StrLen(name), false);
BinToStr(tmp2, sizeof(tmp2), hash, sizeof(hash));
UniFormat(tmp, sizeof(tmp), L"%s\\tmp_%S.exe", MsGetMyTempDirW(), tmp2);
SeekBuf(b, 0, 0);
DumpBufW(b, tmp);
FreeBuf(b);
return RunW(tmp, NULL, false, false);
}
// Show the Easter Egg // Show the Easter Egg
void ShowEasterEgg(HWND hWnd) void ShowEasterEgg(HWND hWnd)
{ {
@ -3634,20 +3542,6 @@ char *StringDlgA(HWND hWnd, wchar_t *title, wchar_t *info, char *def, UINT icon,
return ret; return ret;
} }
// Draw frame
void LedDrawRect(LED *d)
{
RECT r;
// Validate arguments
if (d == NULL)
{
return;
}
SetRect(&r, 0, 0, LED_WIDTH, LED_HEIGHT);
FrameRect(d->hDC, &r, GetStockObject(WHITE_BRUSH));
}
// Restarting dialog // Restarting dialog
UINT Win9xRebootDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param) UINT Win9xRebootDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param)
{ {
@ -3946,18 +3840,6 @@ bool IpIsFilled(HWND hWnd, UINT id)
} }
} }
// Clear the IP address
void IpClear(HWND hWnd, UINT id)
{
// Validate arguments
if (hWnd == NULL)
{
return;
}
SendMsg(hWnd, id, IPM_CLEARADDRESS, 0, 0);
}
// Get an IP address // Get an IP address
UINT IpGet(HWND hWnd, UINT id) UINT IpGet(HWND hWnd, UINT id)
{ {
@ -4521,39 +4403,6 @@ void SetMenuItemBold(HMENU hMenu, UINT pos, bool bold)
SetMenuItemInfo(hMenu, pos, true, &info); SetMenuItemInfo(hMenu, pos, true, &info);
} }
// Enable / disable the menu item
void SetMenuItemEnable(HMENU hMenu, UINT pos, bool enable)
{
MENUITEMINFO info;
// Validate arguments
if (hMenu == NULL || pos == INFINITE)
{
return;
}
Zero(&info, sizeof(info));
info.cbSize = sizeof(info);
info.fMask = MIIM_STATE;
if (GetMenuItemInfo(hMenu, pos, true, &info) == false)
{
return;
}
if (enable)
{
info.fState |= MFS_ENABLED;
info.fState = info.fState & ~MFS_DISABLED;
}
else
{
info.fState |= MFS_DISABLED;
info.fState = info.fState & ~MFS_ENABLED;
}
SetMenuItemInfo(hMenu, pos, true, &info);
}
// Remove a menu item // Remove a menu item
void DeleteMenuItem(HMENU hMenu, UINT pos) void DeleteMenuItem(HMENU hMenu, UINT pos)
{ {
@ -5686,10 +5535,6 @@ UINT LvInsertItemByImageListIdA(HWND hWnd, UINT id, UINT image, void *param, cha
} }
// Change the image // Change the image
void LvSetItemImage(HWND hWnd, UINT id, UINT index, UINT icon)
{
LvSetItemImageByImageListId(hWnd, id, index, GetIcon(icon));
}
void LvSetItemImageByImageListId(HWND hWnd, UINT id, UINT index, UINT image) void LvSetItemImageByImageListId(HWND hWnd, UINT id, UINT index, UINT image)
{ {
LVITEM t; LVITEM t;
@ -5813,18 +5658,6 @@ void LvSetView(HWND hWnd, UINT id, bool details)
} }
} }
// Ensure that the specified item is visible
void LvShow(HWND hWnd, UINT id, UINT index)
{
// Validate arguments
if (hWnd == NULL)
{
return;
}
ListView_EnsureVisible(DlgItem(hWnd, id), index, false);
}
// Get whether there is currently selected item // Get whether there is currently selected item
bool LvIsSelected(HWND hWnd, UINT id) bool LvIsSelected(HWND hWnd, UINT id)
{ {
@ -5982,31 +5815,6 @@ bool LvIsMasked(HWND hWnd, UINT id)
return true; return true;
} }
// Get the number of items that are currently masked
UINT LvGetMaskedNum(HWND hWnd, UINT id)
{
UINT i = INFINITE;
UINT num = 0;
// Validate arguments
if (hWnd == NULL)
{
return 0;
}
while (true)
{
i = LvGetNextMasked(hWnd, id, i);
if (i == INFINITE)
{
break;
}
num++;
}
return num;
}
// Get the items that is currently masked // Get the items that is currently masked
UINT LvGetNextMasked(HWND hWnd, UINT id, UINT start) UINT LvGetNextMasked(HWND hWnd, UINT id, UINT start)
{ {
@ -6019,27 +5827,6 @@ UINT LvGetNextMasked(HWND hWnd, UINT id, UINT start)
return ListView_GetNextItem(DlgItem(hWnd, id), start, LVNI_SELECTED); return ListView_GetNextItem(DlgItem(hWnd, id), start, LVNI_SELECTED);
} }
// Search an item with the specified string
UINT LvSearchStr_(HWND hWnd, UINT id, UINT pos, wchar_t *str)
{
UINT ret;
LVFINDINFOW t;
// Validate arguments
if (hWnd == NULL || str == NULL)
{
return INFINITE;
}
Zero(&t, sizeof(t));
t.flags = LVFI_STRING;
t.psz = str;
t.vkDirection = VK_DOWN;
ret = SendMsg(hWnd, id, LVM_FINDITEMW, -1, (LPARAM)&t);
return ret;
}
// Search an item with the specified string // Search an item with the specified string
UINT LvSearchStr(HWND hWnd, UINT id, UINT pos, wchar_t *str) UINT LvSearchStr(HWND hWnd, UINT id, UINT pos, wchar_t *str)
{ {
@ -6794,33 +6581,6 @@ STATUS_WINDOW *StatusPrinterWindowStart(SOCK *s, wchar_t *account_name)
return sw; return sw;
} }
// Get the string
wchar_t *LbGetStr(HWND hWnd, UINT id)
{
// Validate arguments
if (hWnd == NULL)
{
return NULL;
}
return GetText(hWnd, id);
}
// String search
UINT LbFindStr(HWND hWnd, UINT id, wchar_t *str)
{
UINT ret;
// Validate arguments
if (hWnd == NULL || str == NULL)
{
return INFINITE;
}
ret = SendMsg(hWnd, id, LB_FINDSTRING, -1, (LPARAM)str);
return ret;
}
// Get the number of items // Get the number of items
UINT LbNum(HWND hWnd, UINT id) UINT LbNum(HWND hWnd, UINT id)
{ {
@ -6834,34 +6594,6 @@ UINT LbNum(HWND hWnd, UINT id)
} }
// Add a string // Add a string
UINT LbAddStr(HWND hWnd, UINT id, wchar_t *str, UINT data)
{
UINT ret;
if (MsIsNt() == false)
{
char *s = CopyUniToStr(str);
ret = LbAddStrA(hWnd, id, s, data);
Free(s);
return ret;
}
// Validate arguments
if (hWnd == NULL || str == NULL)
{
return INFINITE;
}
ret = SendMsg(hWnd, id, LB_ADDSTRING, 0, (LPARAM)str);
SendMsg(hWnd, id, LB_SETITEMDATA, ret, (LPARAM)data);
if (LbNum(hWnd, id) == 1)
{
LbSelectIndex(hWnd, id, 0);
}
return ret;
}
UINT LbAddStrA(HWND hWnd, UINT id, char *str, UINT data) UINT LbAddStrA(HWND hWnd, UINT id, char *str, UINT data)
{ {
UINT ret; UINT ret;
@ -6883,34 +6615,6 @@ UINT LbAddStrA(HWND hWnd, UINT id, char *str, UINT data)
} }
// Insert a string // Insert a string
UINT LbInsertStr(HWND hWnd, UINT id, UINT index, wchar_t *str, UINT data)
{
UINT ret;
if (MsIsNt() == false)
{
char *s = CopyUniToStr(str);
ret = LbInsertStrA(hWnd, id, index, s, data);
Free(s);
return ret;
}
// Validate arguments
if (hWnd == NULL || str == NULL)
{
return INFINITE;
}
ret = SendMsg(hWnd, id, LB_INSERTSTRING, index, (LPARAM)str);
SendMsg(hWnd, id, LB_SETITEMDATA, ret, (LPARAM)data);
if (LbNum(hWnd, id) == 1)
{
LbSelect(hWnd, id, 0);
}
return ret;
}
UINT LbInsertStrA(HWND hWnd, UINT id, UINT index, char *str, UINT data) UINT LbInsertStrA(HWND hWnd, UINT id, UINT index, char *str, UINT data)
{ {
UINT ret; UINT ret;
@ -6994,18 +6698,6 @@ UINT LbFindData(HWND hWnd, UINT id, UINT data)
return INFINITE; return INFINITE;
} }
// Set the height of the item
void LbSetHeight(HWND hWnd, UINT id, UINT value)
{
// Validate arguments
if (hWnd == NULL)
{
return;
}
SendMsg(hWnd, id, LB_SETITEMHEIGHT, 0, (UINT)(GetTextScalingFactor() * (double)value));
}
// Search by specifying the data // Search by specifying the data
void LbSelect(HWND hWnd, UINT id, int data) void LbSelect(HWND hWnd, UINT id, int data)
{ {
@ -7046,25 +6738,6 @@ UINT LbGetSelectIndex(HWND hWnd, UINT id)
return SendMsg(hWnd, id, LB_GETCURSEL, 0, 0); return SendMsg(hWnd, id, LB_GETCURSEL, 0, 0);
} }
// Get the value that is currently selected
UINT LbGetSelect(HWND hWnd, UINT id)
{
UINT index;
// Validate arguments
if (hWnd == NULL)
{
return INFINITE;
}
index = LbGetSelectIndex(hWnd, id);
if (index == INFINITE)
{
return INFINITE;
}
return LbGetData(hWnd, id, index);
}
// Password input dialog state change // Password input dialog state change
void PasswordDlgProcChange(HWND hWnd, UI_PASSWORD_DLG *p) void PasswordDlgProcChange(HWND hWnd, UI_PASSWORD_DLG *p)
{ {
@ -7223,33 +6896,6 @@ UINT CbAddStr9xA(HWND hWnd, UINT id, char *str, UINT data)
} }
// Insert a string // Insert a string
UINT CbInsertStr(HWND hWnd, UINT id, UINT index, wchar_t *str, UINT data)
{
UINT ret;
// Validate arguments
if (hWnd == NULL || str == NULL)
{
return INFINITE;
}
if (MsIsNt() == false)
{
char *s = CopyUniToStr(str);
ret = CbInsertStr9xA(hWnd, id, index, s, data);
Free(s);
return ret;
}
ret = SendMsg(hWnd, id, CB_INSERTSTRING, index, (LPARAM)str);
SendMsg(hWnd, id, CB_SETITEMDATA, ret, (LPARAM)data);
if (CbNum(hWnd, id) == 1)
{
CbSelect(hWnd, id, 0);
}
return ret;
}
UINT CbInsertStr9xA(HWND hWnd, UINT id, UINT index, char *str, UINT data) UINT CbInsertStr9xA(HWND hWnd, UINT id, UINT index, char *str, UINT data)
{ {
UINT ret; UINT ret;
@ -7836,14 +7482,6 @@ UINT PassphraseDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *
return 0; return 0;
} }
// PKCS utility
void PkcsUtil()
{
InitWinUi(_UU("PKCS_UTIL_TITLE"), _SS("DEFAULT_FONT"), _II("DEFAULT_FONT_SIZE"));
Dialog(NULL, D_PKCSUTIL, PkcsUtilProc, NULL);
FreeWinUi();
}
// PKCS writing // PKCS writing
void PkcsUtilWrite(HWND hWnd) void PkcsUtilWrite(HWND hWnd)
{ {
@ -8918,114 +8556,6 @@ UINT DialogEx2(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool wh
return ret; return ret;
} }
// Create a modeless dialog
HWND DialogCreateEx(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool white)
{
HWND ret = NULL;
DIALOG_PARAM p;
// Validate arguments
if (id == 0)
{
return 0;
}
Zero(&p, sizeof(p));
p.param = param;
p.white = white;
p.proc = proc;
if (MsIsNt() == false)
{
// Win9x
ret = CreateDialogParamA(hDll, MAKEINTRESOURCEA(id), hWnd,
(DLGPROC)proc, (LPARAM)param);
}
else
{
// WinNT
ret = CreateDialogParamW(hDll, MAKEINTRESOURCEW(id), hWnd,
(DLGPROC)proc, (LPARAM)param);
}
return ret;
}
// Set the bitmap to the button
void SetBitmap(HWND hWnd, UINT id, UINT bmp_id)
{
HBITMAP bmp;
char *class_name;
DIALOG_PARAM *dialog_param = NULL;
bool need_resize = 0;
double resize_x = 1.0;
double resize_y = 1.0;
bool add_to_free_list = false;
// Validate arguments
if (hWnd == NULL)
{
return;
}
bmp = LoadImage(hDll, MAKEINTRESOURCE(bmp_id), IMAGE_BITMAP, 0, 0, (MsIsNt() ? LR_SHARED : 0) | LR_VGACOLOR);
if (bmp == NULL)
{
return;
}
dialog_param = GetParam(hWnd);
// Determine the need for resizing
if (dialog_param)
{
if (MsIsVista())
{
GetWindowAndControlSizeResizeScale(hWnd, &need_resize, &resize_x, &resize_y);
if (need_resize)
{
// Resize
UINT src_x, src_y, dst_x, dst_y;
if (GetBitmapSize(bmp, &src_x, &src_y))
{
HBITMAP new_bmp;
double scale_factor = MIN(resize_x, resize_y);
dst_x = (UINT)((double)src_x * scale_factor);
dst_y = (UINT)((double)src_y * scale_factor);
new_bmp = ResizeBitmap(bmp, src_x, src_y, dst_x, dst_y);
if (new_bmp != NULL)
{
bmp = new_bmp;
add_to_free_list = true;
}
}
}
}
}
class_name = GetClassA(hWnd, id);
if (StrCmpi(class_name, "Static") != 0)
{
SendMsg(hWnd, id, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp);
}
else
{
SendMsg(hWnd, id, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp);
}
Free(class_name);
if (add_to_free_list)
{
Add(dialog_param->BitmapList, bmp);
}
}
// Initialize the icon cache // Initialize the icon cache
void InitIconCache() void InitIconCache()
{ {
@ -9267,58 +8797,6 @@ void SetFontEx(HWND hWnd, UINT id, HFONT hFont, bool no_adjust_font_size)
} }
} }
// Get the font size
bool GetFontSize(HFONT hFont, UINT *x, UINT *y)
{
bool ret = false;
UINT xx = 0;
UINT yy = 0;
// Search for the font handle
LockList(font_list);
{
UINT i;
for (i = 0;i < LIST_NUM(font_list);i++)
{
FONT *f = LIST_DATA(font_list, i);
if (f->hFont == hFont)
{
xx = f->x;
yy = f->y;
ret = true;
break;
}
}
}
UnlockList(font_list);
if (ret == false)
{
ret = CalcFontSize(hFont, &xx, &yy);
}
if (xx == 0 || yy == 0)
{
xx = 8;
yy = 16;
}
if (x != NULL)
{
*x = xx;
}
if (y != NULL)
{
*y = yy;
}
return ret;
}
// Calculate the font size // Calculate the font size
bool CalcFontSize(HFONT hFont, UINT *x, UINT *y) bool CalcFontSize(HFONT hFont, UINT *x, UINT *y)
{ {
@ -9703,45 +9181,6 @@ void CenterParent(HWND hWnd)
SetWindowPos(hWnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE); SetWindowPos(hWnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
} }
// Get the coordinates of the client region of the window
void GetWindowClientRect(HWND hWnd, struct tagRECT *rect)
{
RECT r1, r2;
HWND hParent;
WINDOWINFO info;
Zero(rect, sizeof(RECT));
// Validate arguments
if (hWnd == NULL || rect == NULL)
{
return;
}
hParent = GetParent(hWnd);
if (hParent == NULL)
{
return;
}
Zero(&info, sizeof(info));
info.cbSize = sizeof(WINDOWINFO);
if (GetWindowInfo(hParent, &info) == false)
{
return;
}
if (GetWindowRect(hWnd, &r1) == false ||
GetWindowRect(hParent, &r2) == false)
{
return;
}
rect->left = r1.left - r2.left - (info.rcClient.left - info.rcWindow.left);
rect->right = r1.right - r2.left - (info.rcClient.left - info.rcWindow.left);
rect->top = r1.top - r2.top - (info.rcClient.top - info.rcWindow.top);
rect->bottom = r1.bottom - r2.top - (info.rcClient.top - info.rcWindow.top);
}
// Move the window to the center // Move the window to the center
void Center(HWND hWnd) void Center(HWND hWnd)
{ {
@ -9785,19 +9224,6 @@ void Center(HWND hWnd)
SetWindowPos(hWnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE); SetWindowPos(hWnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
} }
// Get the size of the monitor
void GetMonitorSize(UINT *width, UINT *height)
{
// Validate arguments
if (width == NULL || height == NULL)
{
return;
}
*width = GetSystemMetrics(SM_CXSCREEN);
*height = GetSystemMetrics(SM_CYSCREEN);
}
// Format the string in the window // Format the string in the window
void FormatText(HWND hWnd, UINT id, ...) void FormatText(HWND hWnd, UINT id, ...)
{ {
@ -9830,83 +9256,6 @@ void FormatText(HWND hWnd, UINT id, ...)
Free(str); Free(str);
va_end(args); va_end(args);
} }
void FormatTextA(HWND hWnd, UINT id, ...)
{
va_list args;
char *buf;
UINT size;
char *str;
// Validate arguments
if (hWnd == NULL)
{
return;
}
str = GetTextA(hWnd, id);
if (str == NULL)
{
return;
}
size = MAX(StrSize(str) * 10, MAX_SIZE * 10);
buf = MallocEx(size, true);
va_start(args, id);
FormatArgs(buf, size, str, args);
SetTextA(hWnd, id, buf);
Free(buf);
Free(str);
va_end(args);
}
// Set a variable-length argument string to the window
void SetTextEx(HWND hWnd, UINT id, wchar_t *str, ...)
{
va_list args;
wchar_t *buf;
UINT size;
// Validate arguments
if (str == NULL || hWnd == NULL)
{
return;
}
size = MAX(UniStrSize(str) * 10, MAX_SIZE * 10);
buf = MallocEx(size, true);
va_start(args, str);
UniFormatArgs(buf, size, str, args);
SetText(hWnd, id, buf);
Free(buf);
va_end(args);
}
void SetTextExA(HWND hWnd, UINT id, char *str, ...)
{
va_list args;
char *buf;
UINT size;
// Validate arguments
if (str == NULL || hWnd == NULL)
{
return;
}
size = MAX(StrSize(str) * 10, MAX_SIZE * 10);
buf = MallocEx(size, true);
va_start(args, str);
FormatArgs(buf, size, str, args);
SetTextA(hWnd, id, buf);
Free(buf);
va_end(args);
}
// Show the variable-length message box // Show the variable-length message box
UINT MsgBoxEx(HWND hWnd, UINT flag, wchar_t *msg, ...) UINT MsgBoxEx(HWND hWnd, UINT flag, wchar_t *msg, ...)
@ -9991,13 +9340,6 @@ UINT DialogInternal(HWND hWnd, UINT id, DIALOG_PROC *proc, void *param)
} }
} }
// Notice that the system configuration has been updated
void NoticeSettingChange()
{
PostMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 0);
DoEvents(NULL);
}
// Dialog box procedure managed by WinUi // Dialog box procedure managed by WinUi
UINT DlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, bool white_color) UINT DlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, bool white_color)
{ {
@ -10099,18 +9441,6 @@ void *GetParam(HWND hWnd)
return ret; return ret;
} }
// Relieve the window from foreground
void NoTop(HWND hWnd)
{
// Validate arguments
if (hWnd == NULL)
{
return;
}
SetWindowPos(hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
}
// Show the windows as foreground // Show the windows as foreground
void Top(HWND hWnd) void Top(HWND hWnd)
{ {
@ -10301,21 +9631,6 @@ UINT GetStyle(HWND hWnd, UINT id)
return GetWindowLong(DlgItem(hWnd, id), GWL_STYLE); return GetWindowLong(DlgItem(hWnd, id), GWL_STYLE);
} }
// Get the number of bytes of the text
UINT GetTextSize(HWND hWnd, UINT id, bool unicode)
{
UINT len;
// Validate arguments
if (hWnd == NULL)
{
return 0;
}
len = GetTextLen(hWnd, id, unicode);
return len + (unicode ? 2 : 1);
}
// Get the number of characters in the text // Get the number of characters in the text
UINT GetTextLen(HWND hWnd, UINT id, bool unicode) UINT GetTextLen(HWND hWnd, UINT id, bool unicode)
{ {
@ -11216,19 +10531,6 @@ HWND DlgItem(HWND hWnd, UINT id)
} }
} }
// Set the title
void SetWinUiTitle(wchar_t *title)
{
// Validate arguments
if (title == NULL)
{
return;
}
Free(title_bar);
title_bar = CopyUniStr(title);
}
// Initialize the WinUi // Initialize the WinUi
void InitWinUi(wchar_t *software_name, char *font, UINT fontsize) void InitWinUi(wchar_t *software_name, char *font, UINT fontsize)
{ {

31
src/Cedar/WinUi.h
View File

@ -410,7 +410,6 @@ struct LED
}; };
void LedDrawString(LED *d, char *str, HFONT f); void LedDrawString(LED *d, char *str, HFONT f);
void LedDrawRect(LED *d);
void LedMainDraw(LED *d, HANDLE h); void LedMainDraw(LED *d, HANDLE h);
void LedSpecial(LED *d, HANDLE h, UINT n); void LedSpecial(LED *d, HANDLE h, UINT n);
@ -575,7 +574,6 @@ struct WINUI_UPDATE_DLG_PARAM
// Function prototype // Function prototype
void InitWinUi(wchar_t *software_name, char *font, UINT fontsize); void InitWinUi(wchar_t *software_name, char *font, UINT fontsize);
void SetWinUiTitle(wchar_t *title);
void FreeWinUi(); void FreeWinUi();
WINUI_UPDATE *InitUpdateUi(wchar_t *title, char *name, char *family_name, UINT64 current_date, UINT current_build, UINT current_ver, char *client_id, bool use_suppress_flag); WINUI_UPDATE *InitUpdateUi(wchar_t *title, char *name, char *family_name, UINT64 current_date, UINT current_build, UINT current_ver, char *client_id, bool use_suppress_flag);
@ -619,7 +617,6 @@ void UnselectEdit(HWND hWnd, UINT id);
UINT SendMsg(HWND hWnd, UINT id, UINT msg, WPARAM wParam, LPARAM lParam); UINT SendMsg(HWND hWnd, UINT id, UINT msg, WPARAM wParam, LPARAM lParam);
bool IsEmpty(HWND hWnd, UINT id); bool IsEmpty(HWND hWnd, UINT id);
UINT GetTextLen(HWND hWnd, UINT id, bool unicode); UINT GetTextLen(HWND hWnd, UINT id, bool unicode);
UINT GetTextSize(HWND hWnd, UINT id, bool unicode);
UINT GetStyle(HWND hWnd, UINT id); UINT GetStyle(HWND hWnd, UINT id);
void SetStyle(HWND hWnd, UINT id, UINT style); void SetStyle(HWND hWnd, UINT id, UINT style);
void RemoveStyle(HWND hWnd, UINT id, UINT style); void RemoveStyle(HWND hWnd, UINT id, UINT style);
@ -632,23 +629,16 @@ void SetShow(HWND hWnd, UINT id, bool b);
bool IsHide(HWND hWnd, UINT id); bool IsHide(HWND hWnd, UINT id);
bool IsShow(HWND hWnd, UINT id); bool IsShow(HWND hWnd, UINT id);
void Top(HWND hWnd); void Top(HWND hWnd);
void NoTop(HWND hWnd);
void *GetParam(HWND hWnd); void *GetParam(HWND hWnd);
void SetParam(HWND hWnd, void *param); void SetParam(HWND hWnd, void *param);
UINT DlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, bool white_color); UINT DlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, bool white_color);
void NoticeSettingChange();
void UiTest(); void UiTest();
UINT DialogInternal(HWND hWnd, UINT id, DIALOG_PROC *proc, void *param); UINT DialogInternal(HWND hWnd, UINT id, DIALOG_PROC *proc, void *param);
UINT MsgBox(HWND hWnd, UINT flag, wchar_t *msg); UINT MsgBox(HWND hWnd, UINT flag, wchar_t *msg);
UINT MsgBoxEx(HWND hWnd, UINT flag, wchar_t *msg, ...); UINT MsgBoxEx(HWND hWnd, UINT flag, wchar_t *msg, ...);
void SetTextEx(HWND hWnd, UINT id, wchar_t *str, ...);
void SetTextExA(HWND hWnd, UINT id, char *str, ...);
void FormatText(HWND hWnd, UINT id, ...); void FormatText(HWND hWnd, UINT id, ...);
void FormatTextA(HWND hWnd, UINT id, ...);
void Center(HWND hWnd); void Center(HWND hWnd);
void GetWindowClientRect(HWND hWnd, struct tagRECT *rect);
void CenterParent(HWND hWnd); void CenterParent(HWND hWnd);
void GetMonitorSize(UINT *width, UINT *height);
void DisableClose(HWND hWnd); void DisableClose(HWND hWnd);
void EnableClose(HWND hWnd); void EnableClose(HWND hWnd);
void InitFont(); void InitFont();
@ -657,19 +647,16 @@ int CompareFont(void *p1, void *p2);
HFONT GetFont(char *name, UINT size, bool bold, bool italic, bool underline, bool strikeout); HFONT GetFont(char *name, UINT size, bool bold, bool italic, bool underline, bool strikeout);
double GetTextScalingFactor(); double GetTextScalingFactor();
bool CalcFontSize(HFONT hFont, UINT *x, UINT *y); bool CalcFontSize(HFONT hFont, UINT *x, UINT *y);
bool GetFontSize(HFONT hFont, UINT *x, UINT *y);
void SetFont(HWND hWnd, UINT id, HFONT hFont); void SetFont(HWND hWnd, UINT id, HFONT hFont);
void SetFontEx(HWND hWnd, UINT id, HFONT hFont, bool no_adjust_font_size); void SetFontEx(HWND hWnd, UINT id, HFONT hFont, bool no_adjust_font_size);
void LimitText(HWND hWnd, UINT id, UINT count); void LimitText(HWND hWnd, UINT id, UINT count);
void Check(HWND hWnd, UINT id, bool b); void Check(HWND hWnd, UINT id, bool b);
bool IsChecked(HWND hWnd, UINT id); bool IsChecked(HWND hWnd, UINT id);
void SetIcon(HWND hWnd, UINT id, UINT icon_id); void SetIcon(HWND hWnd, UINT id, UINT icon_id);
void SetBitmap(HWND hWnd, UINT id, UINT bmp_id);
bool SecureDeviceWindow(HWND hWnd, WINUI_SECURE_BATCH *batch, UINT num_batch, UINT device_id, UINT bitmap_id); bool SecureDeviceWindow(HWND hWnd, WINUI_SECURE_BATCH *batch, UINT num_batch, UINT device_id, UINT bitmap_id);
UINT Dialog(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param); UINT Dialog(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param);
UINT DialogEx(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool white); UINT DialogEx(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool white);
UINT DialogEx2(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool white, bool meiryo); UINT DialogEx2(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool white, bool meiryo);
HWND DialogCreateEx(HWND hWnd, UINT id, WINUI_DIALOG_PROC *proc, void *param, bool white);
UINT __stdcall InternalDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); UINT __stdcall InternalDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
UINT SecureDeviceWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param); UINT SecureDeviceWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param);
HFONT Font(UINT size, UINT bold); HFONT Font(UINT size, UINT bold);
@ -687,7 +674,6 @@ wchar_t *SaveDlg(HWND hWnd, wchar_t *filter, wchar_t *title, wchar_t *default_na
char *SaveDlgA(HWND hWnd, char *filter, char *title, char *default_name, char *default_ext); char *SaveDlgA(HWND hWnd, char *filter, char *title, char *default_name, char *default_ext);
wchar_t *MakeFilter(wchar_t *str); wchar_t *MakeFilter(wchar_t *str);
char *MakeFilterA(char *str); char *MakeFilterA(char *str);
void PkcsUtil();
UINT PkcsUtilProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param); UINT PkcsUtilProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param);
void PkcsUtilWrite(HWND hWnd); void PkcsUtilWrite(HWND hWnd);
void PkcsUtilErase(HWND hWnd); void PkcsUtilErase(HWND hWnd);
@ -700,7 +686,6 @@ void PasswordDlgProcChange(HWND hWnd, UI_PASSWORD_DLG *p);
UINT CbAddStr(HWND hWnd, UINT id, wchar_t *str, UINT data); UINT CbAddStr(HWND hWnd, UINT id, wchar_t *str, UINT data);
UINT CbAddStrA(HWND hWnd, UINT id, char *str, UINT data); UINT CbAddStrA(HWND hWnd, UINT id, char *str, UINT data);
UINT CbAddStr9xA(HWND hWnd, UINT id, char *str, UINT data); UINT CbAddStr9xA(HWND hWnd, UINT id, char *str, UINT data);
UINT CbInsertStr(HWND hWnd, UINT id, UINT index, wchar_t *str, UINT data);
UINT CbInsertStr9xA(HWND hWnd, UINT id, UINT index, char *str, UINT data); UINT CbInsertStr9xA(HWND hWnd, UINT id, UINT index, char *str, UINT data);
void CbSelectIndex(HWND hWnd, UINT id, UINT index); void CbSelectIndex(HWND hWnd, UINT id, UINT index);
UINT CbNum(HWND hWnd, UINT id); UINT CbNum(HWND hWnd, UINT id);
@ -716,21 +701,15 @@ UINT CbGetSelectIndex(HWND hWnd, UINT id);
UINT CbGetSelect(HWND hWnd, UINT id); UINT CbGetSelect(HWND hWnd, UINT id);
void SetRange(HWND hWnd, UINT id, UINT start, UINT end); void SetRange(HWND hWnd, UINT id, UINT start, UINT end);
void SetPos(HWND hWnd, UINT id, UINT pos); void SetPos(HWND hWnd, UINT id, UINT pos);
UINT LbAddStr(HWND hWnd, UINT id, wchar_t *str, UINT data);
UINT LbAddStrA(HWND hWnd, UINT id, char *str, UINT data); UINT LbAddStrA(HWND hWnd, UINT id, char *str, UINT data);
UINT LbInsertStr(HWND hWnd, UINT id, UINT index, wchar_t *str, UINT data);
UINT LbInsertStrA(HWND hWnd, UINT id, UINT index, char *str, UINT data); UINT LbInsertStrA(HWND hWnd, UINT id, UINT index, char *str, UINT data);
void LbSelectIndex(HWND hWnd, UINT id, UINT index); void LbSelectIndex(HWND hWnd, UINT id, UINT index);
UINT LbNum(HWND hWnd, UINT id); UINT LbNum(HWND hWnd, UINT id);
UINT LbFindStr(HWND hWnd, UINT id, wchar_t *str);
wchar_t *LbGetStr(HWND hWnd, UINT id);
UINT LbFindData(HWND hWnd, UINT id, UINT data); UINT LbFindData(HWND hWnd, UINT id, UINT data);
UINT LbGetData(HWND hWnd, UINT id, UINT index); UINT LbGetData(HWND hWnd, UINT id, UINT index);
void LbSelect(HWND hWnd, UINT id, int data); void LbSelect(HWND hWnd, UINT id, int data);
void LbReset(HWND hWnd, UINT id); void LbReset(HWND hWnd, UINT id);
void LbSetHeight(HWND hWnd, UINT id, UINT value);
UINT LbGetSelectIndex(HWND hWnd, UINT id); UINT LbGetSelectIndex(HWND hWnd, UINT id);
UINT LbGetSelect(HWND hWnd, UINT id);
STATUS_WINDOW *StatusPrinterWindowStart(SOCK *s, wchar_t *account_name); STATUS_WINDOW *StatusPrinterWindowStart(SOCK *s, wchar_t *account_name);
void StatusPrinterWindowStop(STATUS_WINDOW *sw); void StatusPrinterWindowStop(STATUS_WINDOW *sw);
void StatusPrinterWindowPrint(STATUS_WINDOW *sw, wchar_t *str); void StatusPrinterWindowPrint(STATUS_WINDOW *sw, wchar_t *str);
@ -751,14 +730,12 @@ UINT LvInsertItemByImageListIdA(HWND hWnd, UINT id, UINT image, void *param, cha
void LvSetItem(HWND hWnd, UINT id, UINT index, UINT pos, wchar_t *str); void LvSetItem(HWND hWnd, UINT id, UINT index, UINT pos, wchar_t *str);
void LvSetItemA(HWND hWnd, UINT id, UINT index, UINT pos, char *str); void LvSetItemA(HWND hWnd, UINT id, UINT index, UINT pos, char *str);
void LvSetItemParam(HWND hWnd, UINT id, UINT index, void *param); void LvSetItemParam(HWND hWnd, UINT id, UINT index, void *param);
void LvSetItemImage(HWND hWnd, UINT id, UINT index, UINT icon);
void LvSetItemImageByImageListId(HWND hWnd, UINT id, UINT index, UINT image); void LvSetItemImageByImageListId(HWND hWnd, UINT id, UINT index, UINT image);
void LvDeleteItem(HWND hWnd, UINT id, UINT index); void LvDeleteItem(HWND hWnd, UINT id, UINT index);
UINT LvNum(HWND hWnd, UINT id); UINT LvNum(HWND hWnd, UINT id);
void *LvGetParam(HWND hWnd, UINT id, UINT index); void *LvGetParam(HWND hWnd, UINT id, UINT index);
wchar_t *LvGetStr(HWND hWnd, UINT id, UINT index, UINT pos); wchar_t *LvGetStr(HWND hWnd, UINT id, UINT index, UINT pos);
char *LvGetStrA(HWND hWnd, UINT id, UINT index, UINT pos); char *LvGetStrA(HWND hWnd, UINT id, UINT index, UINT pos);
void LvShow(HWND hWnd, UINT id, UINT index);
UINT LvSearchParam(HWND hWnd, UINT id, void *param); UINT LvSearchParam(HWND hWnd, UINT id, void *param);
UINT LvSearchStr(HWND hWnd, UINT id, UINT pos, wchar_t *str); UINT LvSearchStr(HWND hWnd, UINT id, UINT pos, wchar_t *str);
UINT LvSearchStrA(HWND hWnd, UINT id, UINT pos, char *str); UINT LvSearchStrA(HWND hWnd, UINT id, UINT pos, char *str);
@ -773,7 +750,6 @@ UINT LvGetNextMasked(HWND hWnd, UINT id, UINT start);
bool LvIsMasked(HWND hWnd, UINT id); bool LvIsMasked(HWND hWnd, UINT id);
bool LvIsSingleSelected(HWND hWnd, UINT id); bool LvIsSingleSelected(HWND hWnd, UINT id);
bool LvIsMultiMasked(HWND hWnd, UINT id); bool LvIsMultiMasked(HWND hWnd, UINT id);
UINT LvGetMaskedNum(HWND hWnd, UINT id);
void LvAutoSize(HWND hWnd, UINT id); void LvAutoSize(HWND hWnd, UINT id);
void LvSelect(HWND hWnd, UINT id, UINT index); void LvSelect(HWND hWnd, UINT id, UINT index);
void LvSelectByParam(HWND hWnd, UINT id, void *param); void LvSelectByParam(HWND hWnd, UINT id, void *param);
@ -805,7 +781,6 @@ void LvRemoveStyle(HWND hWnd, UINT id, UINT style);
HMENU LoadSubMenu(UINT menu_id, UINT pos, HMENU *parent_menu); HMENU LoadSubMenu(UINT menu_id, UINT pos, HMENU *parent_menu);
UINT GetMenuItemPos(HMENU hMenu, UINT id); UINT GetMenuItemPos(HMENU hMenu, UINT id);
void DeleteMenuItem(HMENU hMenu, UINT pos); void DeleteMenuItem(HMENU hMenu, UINT pos);
void SetMenuItemEnable(HMENU hMenu, UINT pos, bool enable);
void SetMenuItemBold(HMENU hMenu, UINT pos, bool bold); void SetMenuItemBold(HMENU hMenu, UINT pos, bool bold);
wchar_t *GetMenuStr(HMENU hMenu, UINT pos); wchar_t *GetMenuStr(HMENU hMenu, UINT pos);
char *GetMenuStrA(HMENU hMenu, UINT pos); char *GetMenuStrA(HMENU hMenu, UINT pos);
@ -829,7 +804,6 @@ void LvSortHander(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT id);
void LvStandardHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT id); void LvStandardHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT id);
void IpSet(HWND hWnd, UINT id, UINT ip); void IpSet(HWND hWnd, UINT id, UINT ip);
UINT IpGet(HWND hWnd, UINT id); UINT IpGet(HWND hWnd, UINT id);
void IpClear(HWND hWnd, UINT id);
bool IpIsFilled(HWND hWnd, UINT id); bool IpIsFilled(HWND hWnd, UINT id);
UINT IpGetFilledNum(HWND hWnd, UINT id); UINT IpGetFilledNum(HWND hWnd, UINT id);
void About(HWND hWnd, CEDAR *cedar, wchar_t *product_name); void About(HWND hWnd, CEDAR *cedar, wchar_t *product_name);
@ -860,14 +834,11 @@ void KakushiThread(THREAD *thread, void *param);
KAKUSHI *InitKakushi(); KAKUSHI *InitKakushi();
void FreeKakushi(KAKUSHI *k); void FreeKakushi(KAKUSHI *k);
void ShowEasterEgg(HWND hWnd); void ShowEasterEgg(HWND hWnd);
bool ExecuteHamcoreExe(char *name);
bool IsRegistedToDontShowFreeEditionDialog(char *server_name); bool IsRegistedToDontShowFreeEditionDialog(char *server_name);
void RegistToDontShowFreeEditionDialog(char *server_name); void RegistToDontShowFreeEditionDialog(char *server_name);
void ShowFreeInfoDialog(HWND hWnd, FREEINFO *info); void ShowFreeInfoDialog(HWND hWnd, FREEINFO *info);
UINT FreeInfoDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param); UINT FreeInfoDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param);
FREEINFO *StartFreeInfoDlg(char *server_name);
void FreeInfoThread(THREAD *thread, void *param); void FreeInfoThread(THREAD *thread, void *param);
void EndFreeInfoDlg(FREEINFO *info);
bool Win32CnCheckAlreadyExists(bool lock); bool Win32CnCheckAlreadyExists(bool lock);
void RegistWindowsFirewallAll(); void RegistWindowsFirewallAll();
void RegistWindowsFirewallAllEx(char *dir); void RegistWindowsFirewallAllEx(char *dir);
@ -889,7 +860,6 @@ HFONT GetMeiryoFont();
HFONT GetMeiryoFontEx(UINT font_size); HFONT GetMeiryoFontEx(UINT font_size);
HFONT GetMeiryoFontEx2(UINT font_size, bool bold); HFONT GetMeiryoFontEx2(UINT font_size, bool bold);
bool ShowWindowsNetworkConnectionDialog(); bool ShowWindowsNetworkConnectionDialog();
SOCK *WinConnectEx2(HWND hWnd, char *server, UINT port, UINT timeout, UINT icon_id, wchar_t *caption, wchar_t *info, bool try_start_ssl, bool ssl_no_tls);
SOCK *WinConnectEx3(HWND hWnd, char *server, UINT port, UINT timeout, UINT icon_id, wchar_t *caption, wchar_t *info, UINT *nat_t_error_code, char *nat_t_svc_name, bool try_start_ssl, bool ssl_no_tls); SOCK *WinConnectEx3(HWND hWnd, char *server, UINT port, UINT timeout, UINT icon_id, wchar_t *caption, wchar_t *info, UINT *nat_t_error_code, char *nat_t_svc_name, bool try_start_ssl, bool ssl_no_tls);
UINT WinConnectDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param); UINT WinConnectDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param);
void WinConnectDlgThread(THREAD *thread, void *param); void WinConnectDlgThread(THREAD *thread, void *param);
@ -907,7 +877,6 @@ WIZARD_PAGE *NewWizardPage(UINT id, WINUI_WIZARD_PROC *proc, wchar_t *title);
void FreeWizardPage(WIZARD_PAGE *p); void FreeWizardPage(WIZARD_PAGE *p);
void AddWizardPage(WIZARD *w, WIZARD_PAGE *p); void AddWizardPage(WIZARD *w, WIZARD_PAGE *p);
WIZARD_PAGE *GetWizardPage(WIZARD *w, UINT id); WIZARD_PAGE *GetWizardPage(WIZARD *w, UINT id);
UINT GetWizardPageIndex(WIZARD *w, UINT id);
void *CreateWizardPageInstance(WIZARD *w, WIZARD_PAGE *p); void *CreateWizardPageInstance(WIZARD *w, WIZARD_PAGE *p);
void ShowWizard(HWND hWndParent, WIZARD *w, UINT start_id); void ShowWizard(HWND hWndParent, WIZARD *w, UINT start_id);
void SetWizardButton(WIZARD_PAGE *p, bool enable_next, bool enable_back, bool enable_close, bool is_finish); void SetWizardButton(WIZARD_PAGE *p, bool enable_next, bool enable_back, bool enable_close, bool is_finish);