Implementing MSVC version.

Perry Werneck
1 parent 1373009b
Showing 7 changed files with 134 additions and 57 deletions Show diff stats
.gitignore
README.md
clean.bat
src/core/windows/init.cc
src/include/lib3270/hllapi.h
src/testprogram/testprogram.cc
win/Makefile.msc
@@ -25,4 +25,9 @@ doxygen/html
 doxygen/rtf
 *~
 *.pc
+*.obj
+*.dll
+*.exe
+*.exp
+*.lib
@@ -82,3 +82,26 @@ TODO
 	$ make install
 	```
+### Windows native with MSVC
+
+1. Install pw3270 with remote control and sdk modules
+
+2. Download and install Visual Studio Build Tools (https://visualstudio.microsoft.com/pt-br/downloads/)
+
+3. Download and install git for windows
+
+4. Build and install the "glue" library using the MSVC Native tools command prompt as administrator.
+
+	```shell
+	git clone https://github.com/PerryWerneck/libipc3270.git ./ipc3270
+	cd ipc3270
+	install.bat
+	```
+
+5. Build and install hllapi library using the MSVC Native tools command prompt as administrator.
+
+	```shell
+	git clone https://github.com/PerryWerneck/libhllapi.git ./hllapi
+	cd hllapi
+	install.bat
+	```
@@ -0,0 +1,2 @@
+@echo off
+nmake /f win\Makefile.msc clean
@@ -36,13 +36,18 @@
  *
  */
-#ifndef _MSC_VER
-	#include <config.h>
-	#pragma comment(lib,"Advapi32.lib")
-#endif // !_MSC_VER
-
  #include <winsock2.h>
  #include <windows.h>
+
+ #ifdef _MSC_VER
+	#pragma comment(lib,"Advapi32.lib")
+	#pragma comment(lib,"ipc3270.lib")
+	#pragma comment(lib,"Delayimp.lib")
+	#include <Delayimp.h>
+ #else
+	#include <config.h>
+ #endif // !_MSC_VER
+
  #include "../private.h"
  #include <lmcons.h>
  #include <delayimp.h>
@@ -50,33 +55,52 @@
  #include <string>
  #include <stdexcept>
  #include <lib3270.h>
+ #include <lib3270/hllapi.h>
+ 
+ #ifdef HAVE_LIBINTL
+	#include <libintl.h>
+ #endif // HAVE_LIBINTL
-#ifdef HAVE_LIBINTL
- #include <libintl.h>
-#endif // HAVE_LIBINTL
-
- #ifdef USING_STATIC_IPC3270
+ using namespace std;
  extern "C" {
-	extern __declspec (dllexport) PfnDliHook __pfnDliNotifyHook2;
-	extern __declspec (dllexport) PfnDliHook __pfnDliFailureHook2;
+ #ifdef _MSC_VER
+
+	#pragma comment(linker, "/EXPORT:DllRegisterServer=DllRegisterServer,PRIVATE")
+	#pragma comment(linker, "/EXPORT:DllUnregisterServer=DllUnregisterServer,PRIVATE")
+	#pragma comment(linker, "/EXPORT:DllInstall=DllInstall,PRIVATE")
+
+	extern HRESULT DllRegisterServer();
+	extern HRESULT DllInstall(BOOL, PCWSTR);
+	extern HRESULT DllUnregisterServer();
+
+ #else 
 	extern __declspec (dllexport) HRESULT DllRegisterServer();
 	extern __declspec (dllexport) HRESULT DllInstall(BOOL, PCWSTR);
+	extern __declspec (dllexport) HRESULT DllUnregisterServer();
+
+ #endif // MSC_VER
 	FARPROC WINAPI hllapi_delay_load_hook(unsigned reason, DelayLoadInfo * info);
  }
- using std::string;
+#ifdef USING_STATIC_IPC3270
-/*---[ Implement ]----------------------------------------------------------------------------------*/
+	// https://docs.microsoft.com/en-us/cpp/build/reference/loading-all-imports-for-a-delay-loaded-dll?view=vs-2019
+	#ifdef _MSC_VER
+		const PfnDliHook __pfnDliNotifyHook2 = hllapi_delay_load_hook;
+		const PfnDliHook __pfnDliFailureHook2 = hllapi_delay_load_hook;
+	#else
+		PfnDliHook __pfnDliNotifyHook2 = hllapi_delay_load_hook;
+		PfnDliHook __pfnDliFailureHook2 = hllapi_delay_load_hook;
+	#endif // _MSC_VER
- // https://docs.microsoft.com/en-us/cpp/build/reference/loading-all-imports-for-a-delay-loaded-dll?view=vs-2019
+#endif // USING_STATIC_IPC3270
- PfnDliHook __pfnDliNotifyHook2 = hllapi_delay_load_hook;
- PfnDliHook __pfnDliFailureHook2 = hllapi_delay_load_hook;
+/*---[ Implement ]----------------------------------------------------------------------------------*/
  static HANDLE hModule = 0;
  static HANDLE hEventLog = 0;
@@ -85,6 +109,10 @@
  	return S_OK;
  }
+ HRESULT DllUnregisterServer() {
+ 	return S_OK;
+ }
+
  HRESULT DllInstall(BOOL bInstall, PCWSTR pszCmdLine) {
  	return S_OK;
  }
@@ -108,39 +136,44 @@
     return TRUE;
  }
- static void eventlog(const char *msg) {
+ HLLAPI_API_CALL hllapi_report_event(LPSTR message) {
-		char	username[UNLEN + 1];
-		DWORD	szName = sizeof(username);
+	char	username[UNLEN + 1];
+	DWORD	szName = sizeof(username);
-		memset(username,0,UNLEN + 1);
+	memset(username,0,UNLEN + 1);
-		if(!GetUserName(username, &szName)) {
-			username[0] = 0;
-		}
+	if(!GetUserName(username, &szName)) {
+		username[0] = 0;
+	}
+
+	const char *outMsg[] = {
+			username,
+			PACKAGE_NAME,
+			message
+	};
+
+	debug("Event: \"%s\"",msg);
-        const char *outMsg[] = {
-                username,
-                PACKAGE_NAME,
-                msg
-        };
-
-        debug("Event: \"%s\"",msg);
-
-        ReportEvent(
-                hEventLog,
-                EVENTLOG_ERROR_TYPE,
-                1,
-                0,
-                NULL,
-                3,
-                0,
-                outMsg,
-                NULL
-        );
+	ReportEvent(
+			hEventLog,
+			EVENTLOG_ERROR_TYPE,
+			1,
+			0,
+			NULL,
+			3,
+			0,
+			outMsg,
+			NULL
+	);
+
+	return HLLAPI_STATUS_SUCCESS;
  }
+
+#ifdef USING_STATIC_IPC3270
+
  static void dummyProc() {
 	throw std::runtime_error(_("Operation not supported"));
  }
@@ -149,6 +182,8 @@
 	static string savedpath;
+	printf("%s\n",__FUNCTION__);
+
 	// https://docs.microsoft.com/en-us/cpp/build/reference/structure-and-constant-definitions?view=vs-2019
 	switch (reason) {
 	case dliNoteStartProcessing:
@@ -197,15 +232,16 @@
 		{
 			string msg = "Can't load ";
 			msg += (const char *) info->szDll;
-			eventlog(msg.c_str());
+			hllapi_report_event((LPSTR) msg.c_str());
 		}
-		return (FARPROC) hModule;
+		break;
 	case dliFailGetProc:
 		{
+			// TODO: Check usage of RaiseException ?
 			string msg = "Can't find method on ";
 			msg += (const char *) info->szDll;
-			eventlog(msg.c_str());
+			hllapi_report_event((LPSTR) msg.c_str());
 		}
 		return (FARPROC) dummyProc;
@@ -217,5 +253,4 @@
  }
- #endif // USING_STATIC_IPC3270
-
+#endif // USING_STATIC_IPC3270
@@ -360,6 +360,12 @@
 	HLLAPI_API_CALL hllapi_set_cursor_position(WORD row, WORD col);
 	/**
+	 * @brief Report event to system log
+	 * 
+	 */
+	HLLAPI_API_CALL hllapi_report_event(LPSTR message);
+
+	/**
 	 * @brief Get cursor address.
 	 *
 	 * @return Cursor address.
@@ -50,6 +50,8 @@
  int main(int argc, char **argv) {
+	 printf("******\n");
+
 	char buffer[SCREEN_LENGTH+1];
  	const char *host	= "";
@@ -269,7 +271,13 @@
 		cout.flush();
 	}
- 	/*
+ 	rc = hllapi_deinit();
+	cout << "hllapi_deinit exits with rc=" << rc << endl;
+
+	return 0;
+ }
+
+	/*
 	rc = hllapi_wait_for_ready(10);
@@ -314,9 +322,4 @@
 	*/
-	rc = hllapi_deinit();
-	cout << "hllapi_deinit exits with rc=" << rc << endl;
-
-	return 0;
- }
@@ -47,6 +47,7 @@ OBJ_FILES= \
 		/DPRODUCT_NAME=$(PRODUCT_NAME) \
 		/DLIB3270_NAME=$(LIB3270_NAME) \
 		/DNDEBUG=1 \
+		/DUSING_STATIC_IPC3270 \
 		/I".\src\include" \
 		/I"$(PW3270_SDK_PATH)\include" \
 		/EHsc \
@@ -60,6 +61,7 @@ testprogram.exe: \
 	@link \
 		/nologo \
 		/OUT:"$@" \
+		/LIBPATH:. \
 		/LIBPATH:"$(PW3270_SDK_PATH)\lib" \
 		src\testprogram\testprogram.obj
@@ -72,11 +74,11 @@ hllapi.dll: \
 		/OUT:"$@" \
 		/LIBPATH:"$(PW3270_SDK_PATH)\lib" \
 		$(OBJ_FILES) \
-		"ipc3270.lib \
-		Advapi32.lib
+		/DELAYLOAD:$(LIB3270_NAME).dll
+
 install: \
-	$(OBJ_FILES)
+	hllapi.dll
 	@echo Building library...
 	@-mkdir "$(PW3270_SDK_PATH)\lib"
 	@lib \
@@ -86,6 +88,7 @@ install: \
 	@-mkdir "$(PW3270_SDK_PATH)\include\lib3270"
 	@copy "src\include\lib3270\*.h" "$(PW3270_SDK_PATH)\include\lib3270"
+	@copy hllapi.dll "$(SystemRoot)\system32"
 clean:
 	del \
	@@ -25,4 +25,9 @@ doxygen/html		@@ -25,4 +25,9 @@ doxygen/html
25	doxygen/rtf	25	doxygen/rtf
26	*~	26	*~
27	*.pc	27	*.pc
		28	+*.obj
		29	+*.dll
		30	+*.exe
		31	+*.exp
		32	+*.lib
28		33
	@@ -82,3 +82,26 @@ TODO		@@ -82,3 +82,26 @@ TODO
82	$ make install	82	$ make install
83	```	83	```
84		84
		85	+### Windows native with MSVC
		86	+
		87	+1. Install pw3270 with remote control and sdk modules
		88	+
		89	+2. Download and install Visual Studio Build Tools (https://visualstudio.microsoft.com/pt-br/downloads/)
		90	+
		91	+3. Download and install git for windows
		92	+
		93	+4. Build and install the "glue" library using the MSVC Native tools command prompt as administrator.
		94	+
		95	+ ```shell
		96	+ git clone https://github.com/PerryWerneck/libipc3270.git ./ipc3270
		97	+ cd ipc3270
		98	+ install.bat
		99	+ ```
		100	+
		101	+5. Build and install hllapi library using the MSVC Native tools command prompt as administrator.
		102	+
		103	+ ```shell
		104	+ git clone https://github.com/PerryWerneck/libhllapi.git ./hllapi
		105	+ cd hllapi
		106	+ install.bat
		107	+ ```
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+@echo off
	2	+nmake /f win\Makefile.msc clean
	@@ -360,6 +360,12 @@		@@ -360,6 +360,12 @@
360	HLLAPI_API_CALL hllapi_set_cursor_position(WORD row, WORD col);	360	HLLAPI_API_CALL hllapi_set_cursor_position(WORD row, WORD col);
361		361
362	/**	362	/**
		363	+ * @brief Report event to system log
		364	+ *
		365	+ */
		366	+ HLLAPI_API_CALL hllapi_report_event(LPSTR message);
		367	+
		368	+ /**
363	* @brief Get cursor address.	369	* @brief Get cursor address.
364	*	370	*
365	* @return Cursor address.	371	* @return Cursor address.