1 year later...

.gitignore

@@ -0,0 +1,2 @@
+windows/win32s/Debug
+windows/win32s/libs/IRCParser/Debug

windows/win32s/StdAfx.cpp

@@ -2,5 +2,22 @@
 //	Tinelix IRC.pch will be the pre-compiled header
 //	stdafx.obj will contain the pre-compiled type information
 
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
+//  
+//	This file is part of Tinelix IRC Client.
+//
+//  Tinelix IRC Client is free software: you can redistribute it and/or modify it under 
+//  the terms of the GNU General Public License as published by the Free Software Foundation, 
+//  either version 3 of the License, or (at your option) any later version.
+//  Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY 
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+//  PARTICULAR PURPOSE.
+//  See the GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License along with this
+//  program. If not, see https://www.gnu.org/licenses/.
+//
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
+
 #include "stdafx.h"
 

windows/win32s/Tinelix IRC.clw

@@ -84,7 +84,7 @@ Control3=IDC_STATIC,static,1342308352
 Control4=IDOK,button,1342373889
 Control5=IDC_LICENSE,static,1342308352
 Control6=IDC_LICENSE2,static,1342308352
-Control7=IDC_SRC_CODE_ADDR,edit,1350633600
+Control7=IDC_SRC_CODE_ADDR,edit,1350633476
 Control8=IDC_SRC_CODE,static,1342308352
 
 [DLG:IDD_TABCHAT]

windows/win32s/Tinelix IRC.cpp

@@ -54,7 +54,24 @@ CIRCApplication::CIRCApplication()
 CIRCApplication theApp;
 
 /////////////////////////////////////////////////////////////////////////////
-// CIRCApplication initialization
+//  CIRCApplication initialization
+//
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
+//  
+//	This file is part of Tinelix IRC Client.
+//
+//  Tinelix IRC Client is free software: you can redistribute it and/or modify it under 
+//  the terms of the GNU General Public License as published by the Free Software Foundation, 
+//  either version 3 of the License, or (at your option) any later version.
+//  Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY 
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+//  PARTICULAR PURPOSE.
+//  See the GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License along with this
+//  program. If not, see https://www.gnu.org/licenses/.
+//
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 BOOL CIRCApplication::InitInstance()
 {
@@ -72,6 +89,33 @@ BOOL CIRCApplication::InitInstance()
 	int nResponse = 0;
 	CMainDlg dlg;
 	m_pMainWnd = &dlg;
+
+	char app_path[640];
+	sprintf(app_path, GetAppPath());
+
+	// Loading WSAWrapper library. 
+	// Available in https://github.com/tinelix/WSAWrapper (LGPLv2.1+)
+	char wsawrap_path[640];
+	sprintf(wsawrap_path, "%s\\wsawrap.dll", app_path);
+	char ircpars_path[640];
+	sprintf(ircpars_path, "%s\\ircpars.dll", app_path);
+
+	wsaWrap = LoadLibrary(wsawrap_path);
+	parser = LoadLibrary(ircpars_path);
+
+	if(!wsaWrap) {
+		MessageBox(NULL, "wsawrap.dll loading error", "Error", MB_OK|MB_ICONSTOP);
+		return FALSE;
+	}
+
+	if(!parser) {
+		MessageBox(NULL, "ircpars.dll loading error", "Error", MB_OK|MB_ICONSTOP);
+		return FALSE;
+	}
+
+	dlg.ImportDllFunctions(wsaWrap, parser);
+
+
 	nResponse = dlg.DoModal();
 
 	if (nResponse == IDOK)

windows/win32s/Tinelix IRC.h

@@ -1,6 +1,6 @@
 //  Tinelix IRC.h : main header file for the Tinelix IRC application
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -34,6 +34,8 @@ class CIRCApplication : public CWinApp
 	CIRCApplication();
 	BOOL CheckIsWin32s();
 	char* GetAppPath();
+	HINSTANCE wsaWrap;
+	HINSTANCE parser;
 
 // Overrides
 	// ClassWizard generated virtual function overrides

windows/win32s/Tinelix IRC.mak

@@ -32,9 +32,9 @@ NULL=nul
 ################################################################################
 # Begin Project
 # PROP Target_Last_Scanned "Tinelix IRC - Win32 Debug"
+MTL=mktyplib.exe
 CPP=cl.exe
 RSC=rc.exe
-MTL=mktyplib.exe
 
 !IF  "$(CFG)" == "Tinelix IRC - Win32 Release"
 
@@ -55,16 +55,16 @@ ALL : "$(OUTDIR)\tlx_irc.exe"
 
 CLEAN : 
 	-@erase ".\Release\tlx_irc.exe"
-	-@erase ".\Release\ConnManDlg.obj"
+	-@erase ".\Release\MainDlg.obj"
 	-@erase ".\Release\Tinelix IRC.pch"
-	-@erase ".\Release\Tinelix IRC.obj"
-	-@erase ".\Release\TextBoxDlg.obj"
 	-@erase ".\Release\ProgressDlg.obj"
-	-@erase ".\Release\AboutDlg.obj"
-	-@erase ".\Release\AppThreadTab.obj"
 	-@erase ".\Release\StatisticsDlg.obj"
+	-@erase ".\Release\ConnManDlg.obj"
 	-@erase ".\Release\StdAfx.obj"
-	-@erase ".\Release\MainDlg.obj"
+	-@erase ".\Release\Tinelix IRC.obj"
+	-@erase ".\Release\TextBoxDlg.obj"
+	-@erase ".\Release\AppThreadTab.obj"
+	-@erase ".\Release\AboutDlg.obj"
 	-@erase ".\Release\Tinelix IRC.res"
 
 "$(OUTDIR)" :
@@ -94,15 +94,15 @@ LINK32=link.exe
 LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
  /pdb:"$(OUTDIR)/tlx_irc.pdb" /machine:I386 /out:"$(OUTDIR)/tlx_irc.exe" 
 LINK32_OBJS= \
+	"$(INTDIR)/MainDlg.obj" \
+	"$(INTDIR)/ProgressDlg.obj" \
+	"$(INTDIR)/StatisticsDlg.obj" \
 	"$(INTDIR)/ConnManDlg.obj" \
+	"$(INTDIR)/StdAfx.obj" \
 	"$(INTDIR)/Tinelix IRC.obj" \
 	"$(INTDIR)/TextBoxDlg.obj" \
-	"$(INTDIR)/ProgressDlg.obj" \
-	"$(INTDIR)/AboutDlg.obj" \
 	"$(INTDIR)/AppThreadTab.obj" \
-	"$(INTDIR)/StatisticsDlg.obj" \
-	"$(INTDIR)/StdAfx.obj" \
-	"$(INTDIR)/MainDlg.obj" \
+	"$(INTDIR)/AboutDlg.obj" \
 	"$(INTDIR)/Tinelix IRC.res"
 
 "$(OUTDIR)\tlx_irc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -132,15 +132,15 @@ CLEAN :
 	-@erase ".\Debug\Tinelix IRC.pch"
 	-@erase ".\Debug\vc40.idb"
 	-@erase ".\Debug\tlx_irc.exe"
+	-@erase ".\Debug\AboutDlg.obj"
+	-@erase ".\Debug\MainDlg.obj"
+	-@erase ".\Debug\StdAfx.obj"
+	-@erase ".\Debug\ProgressDlg.obj"
 	-@erase ".\Debug\Tinelix IRC.obj"
+	-@erase ".\Debug\StatisticsDlg.obj"
 	-@erase ".\Debug\TextBoxDlg.obj"
-	-@erase ".\Debug\AboutDlg.obj"
 	-@erase ".\Debug\AppThreadTab.obj"
-	-@erase ".\Debug\ProgressDlg.obj"
 	-@erase ".\Debug\ConnManDlg.obj"
-	-@erase ".\Debug\MainDlg.obj"
-	-@erase ".\Debug\StatisticsDlg.obj"
-	-@erase ".\Debug\StdAfx.obj"
 	-@erase ".\Debug\Tinelix IRC.res"
 	-@erase ".\Debug\tlx_irc.ilk"
 	-@erase ".\Debug\tlx_irc.pdb"
@@ -173,15 +173,15 @@ LINK32=link.exe
 LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
  /pdb:"$(OUTDIR)/tlx_irc.pdb" /debug /machine:I386 /out:"$(OUTDIR)/tlx_irc.exe" 
 LINK32_OBJS= \
+	"$(INTDIR)/AboutDlg.obj" \
+	"$(INTDIR)/MainDlg.obj" \
+	"$(INTDIR)/StdAfx.obj" \
+	"$(INTDIR)/ProgressDlg.obj" \
 	"$(INTDIR)/Tinelix IRC.obj" \
+	"$(INTDIR)/StatisticsDlg.obj" \
 	"$(INTDIR)/TextBoxDlg.obj" \
-	"$(INTDIR)/AboutDlg.obj" \
 	"$(INTDIR)/AppThreadTab.obj" \
-	"$(INTDIR)/ProgressDlg.obj" \
 	"$(INTDIR)/ConnManDlg.obj" \
-	"$(INTDIR)/MainDlg.obj" \
-	"$(INTDIR)/StatisticsDlg.obj" \
-	"$(INTDIR)/StdAfx.obj" \
 	"$(INTDIR)/Tinelix IRC.res"
 
 "$(OUTDIR)\tlx_irc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

windows/win32s/Tinelix IRC.rc

@@ -84,22 +84,22 @@ END
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 241, 156
+IDD_ABOUTBOX DIALOGEX 0, 0, 241, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Tinelix IRC"
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDR_APPICON,IDC_STATIC,5,6,21,20
-    LTEXT           "Tinelix IRC Client 0.2.0-b002 for Win32s",IDC_STATIC,35,
+    LTEXT           "Tinelix IRC Client 0.2.0-b003 for Win32s",IDC_STATIC,35,
                     6,156,8,SS_NOPREFIX
-    LTEXT           "Copyright � 2023 Dmitry Tretyakov (Tinelix)",IDC_STATIC,
-                    35,17,170,10
-    DEFPUSHBUTTON   "OK",IDOK,190,137,46,14,WS_GROUP
+    LTEXT           "Copyright � 2023, 2024 Dmitry Tretyakov (Tinelix)",
+                    IDC_STATIC,35,17,170,10
+    DEFPUSHBUTTON   "OK",IDOK,190,140,46,14,WS_GROUP
     LTEXT           "This is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.",
                     IDC_LICENSE,35,36,201,36
     LTEXT           "Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.",
                     IDC_LICENSE2,35,74,201,36
-    EDITTEXT        IDC_SRC_CODE_ADDR,93,115,137,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_SRC_CODE_ADDR,93,115,143,21,ES_MULTILINE | 
                     ES_READONLY,WS_EX_TRANSPARENT
     LTEXT           "Source code:",IDC_SRC_CODE,35,117,53,10
 END
@@ -214,7 +214,7 @@ BEGIN
         LEFTMARGIN, 5
         RIGHTMARGIN, 236
         TOPMARGIN, 6
-        BOTTOMMARGIN, 151
+        BOTTOMMARGIN, 154
     END
 
     IDD_TABTHREAD, DIALOG
@@ -295,8 +295,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,2,0,2
- PRODUCTVERSION 0,2,0,2
+ FILEVERSION 0,2,0,3
+ PRODUCTVERSION 0,2,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x23L
@@ -314,13 +314,13 @@ BEGIN
             VALUE "Comments", "Tinelix IRC Client compatible version with Win32s, Windows 95/98, Windows NT and 64-bit (AMD64) Windows editions.\0"
             VALUE "CompanyName", "Tinelix\0"
             VALUE "FileDescription", "Tinelix IRC\0"
-            VALUE "FileVersion", "0.2.0-b002\0"
+            VALUE "FileVersion", "0.2.0-b003\0"
             VALUE "InternalName", "Tinelix IRC for Win32s\0"
             VALUE "LegalCopyright", "Copyright � 2023 Dmitry Tretyakov (aka. tretdm). Licensed under GPLv3.\0"
             VALUE "OriginalFilename", "tlx_irc.exe\0"
             VALUE "ProductName", "Tinelix IRC for Win32s\0"
-            VALUE "ProductVersion", "0.2.0-b002\0"
-            VALUE "SpecialBuild", "Source code: https://github.com/tinelix/irc-client-win32s\0"
+            VALUE "ProductVersion", "0.2.0-b003\0"
+            VALUE "SpecialBuild", "Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s\0"
         END
     END
     BLOCK "VarFileInfo"

windows/win32s/dialogs/AboutDlg.cpp

@@ -1,6 +1,6 @@
 //  AboutDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 
 #include "stdafx.h"
@@ -72,7 +72,7 @@ BOOL CAboutDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
-	src_code_repo = CString("https://github.com/tinelix/irc-client-win32s");
+	src_code_repo = CString("https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s");
 	CEdit* source_code_addr = (CEdit*)GetDlgItem(IDC_SRC_CODE_ADDR);
 	source_code_addr->SetWindowText(src_code_repo);
 

windows/win32s/dialogs/AboutDlg.h

@@ -1,6 +1,6 @@
 //  AboutDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CAboutDlg dialog

windows/win32s/dialogs/ConnManDlg.cpp

@@ -1,6 +1,6 @@
 //  ConnManDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include "..\Tinelix IRC.h"

windows/win32s/dialogs/ConnManDlg.h

@@ -1,6 +1,6 @@
 //  ConnManDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CConnManDlg dialog