Merge branch 'master' of https://github.com/osfree-project/osfree

osfree-project · Apr 22, 2024 · 7716ac1 · 7716ac1
2 parents 3cb7eb5 + 9d51ac2
commit 7716ac1
Show file tree

Hide file tree

Showing 13 changed files with 127 additions and 7 deletions.
diff --git a/DOS b/DOS
diff --git a/OS2/Shared/all_querypathinfo.c b/OS2/Shared/all_querypathinfo.c
@@ -0,0 +1,26 @@
+/*!
+
+   @file all_querypathinfo.c
+
+   @brief utility functions for query path info
+   shared along all code
+
+   (c) osFree Project 2024, <http://www.osFree.org>
+   for licence see licence.txt in root directory, or project website
+
+   @author Yuri Prokushev <yuri.prokushev@gmail.com>
+*/
+
+#include <all_shared.h> /*  shared functions and defines */
+
+APIRET all_QueryPathInfo(PSZ  pszPathName,
+                        ULONG ulInfoLevel,
+                        PVOID pInfo,
+                        ULONG cbInfoBuf)
+{
+#ifdef __386__
+ return DosQueryPathInfo(pszPathName, ulInfoLevel, pInfo, cbInfoBuf);
+#else
+ return DosQPathInfo(pszPathName, ulInfoLevel, (PBYTE)pInfo, cbInfoBuf, 0);
+#endif
+}
diff --git a/OS2/Shared/all_setpathinfo.c b/OS2/Shared/all_setpathinfo.c
@@ -0,0 +1,27 @@
+/*!
+
+   @file all_setpathinfo.c
+
+   @brief utility functions for set path info
+   shared along all code
+
+   (c) osFree Project 2024, <http://www.osFree.org>
+   for licence see licence.txt in root directory, or project website
+
+   @author Yuri Prokushev <yuri.prokushev@gmail.com>
+*/
+
+#include <all_shared.h> /*  shared functions and defines */
+
+APIRET all_SetPathInfo(PSZ pszPathName,
+                       ULONG ulInfoLevel,
+                       PVOID pInfoBuf,
+                       ULONG cbInfoBuf,
+                       ULONG flOptions)
+{
+#ifdef __386__
+ return DosSetPathInfo(pszPathName, ulInfoLevel, pInfoBuf, cbInfoBuf, flOptions);
+#else
+ return DosSetPathInfo(pszPathName, ulInfoLevel, (PBYTE)pInfoBuf, cbInfoBuf, flOptions, 0);
+#endif
+}
diff --git a/OS2/Shared/libs16/_wcc.cmd b/OS2/Shared/libs16/_wcc.cmd
@@ -1,5 +1,4 @@
 @echo off
-set verbose=yes
 set root=.
 :loop
 if exist "%root%\tools\mk\all.mk" goto found

diff --git a/OS2/Shared/libs16/makefile b/OS2/Shared/libs16/makefile
@@ -6,7 +6,7 @@ PROJ = all_shared16
 TRGT = $(PROJ).lib
 srcfiles = $(p)all_messages$(e) $(p)all_querycurrentdisk$(e) $(p)all_queryfsname$(e) &
            $(p)all_dlist$(e) $(p)all_pathmanipulation$(e) $(p)all_performrecursiveaction$(e) &
-           $(p)all_debug$(e)
+           $(p)all_debug$(e) $(p)all_setpathinfo$(e) $(p)all_querypathinfo$(e)
 UNI2H = 0
 NOLIBS = 1
 ADD_COPT =

diff --git a/OS2/Shared/makefile b/OS2/Shared/makefile
@@ -7,7 +7,7 @@ PROJ = all_shared
 TRGT = $(PROJ).lib
 srcfiles = $(p)all_messages$(e) $(p)all_querycurrentdisk$(e) $(p)all_queryfsname$(e) &
            $(p)all_dlist$(e) $(p)all_pathmanipulation$(e) $(p)all_performrecursiveaction$(e) &
-           $(p)all_debug$(e)
+           $(p)all_debug$(e) $(p)all_setpathinfo$(e) $(p)all_querypathinfo$(e)
 
 UNI2H = 1
 ADD_COPT =  

diff --git a/Win32 b/Win32
diff --git a/dual b/dual
diff --git a/include/os3/all_querypathinfo.h b/include/os3/all_querypathinfo.h
@@ -0,0 +1,21 @@
+/*!
+  
+   @file all_querypathinfo.h  
+ 
+   @brief all_QueryPathInfo utility function header, shared along all code
+
+   (c) osFree Project 2024, <http://www.osFree.org>
+   for licence see licence.txt in root directory, or project website
+
+   @author Yuri Prokushev <yuri.prokushev@gmail.com>
+*/
+
+#ifndef _ALL_QUERYPATHINFO_H_
+#define _ALL_QUERYPATHINFO_H_
+
+APIRET all_QueryPathInfo(PSZ  pszPathName,
+                        ULONG ulInfoLevel,
+                        PVOID pInfo,
+                        ULONG cbInfoBuf);
+
+#endif /* _ALL_QUERYPATHINFO_H_ */
diff --git a/include/os3/all_setpathinfo.h b/include/os3/all_setpathinfo.h
@@ -0,0 +1,22 @@
+/*!
+  
+   @file all_setpathinfo.h  
+ 
+   @brief all_SetPathInfo utility function header, shared along all code
+
+   (c) osFree Project 2024, <http://www.osFree.org>
+   for licence see licence.txt in root directory, or project website
+
+   @author Yuri Prokushev <yuri.prokushev@gmail.com>
+*/
+
+#ifndef _ALL_SETPATHINFO_H_
+#define _ALL_SETPATHINFO_H_
+
+APIRET all_SetPathInfo(PSZ pszPathName,
+                       ULONG ulInfoLevel,
+                       PVOID pInfoBuf,
+                       ULONG cbInfoBuf,
+                       ULONG flOptions);
+
+#endif /* _ALL_SETPATHINFO_H_ */
diff --git a/include/os3/all_shared.h b/include/os3/all_shared.h
@@ -45,5 +45,7 @@
 #include "all_querycurrentdisk.h"
 #include "all_queryfsname.h"
 #include "all_messages.h"
+#include "all_setpathinfo.h"
+#include "all_querypathinfo.h"
 
 #endif /* _ALL_SHARED_H_ */
diff --git a/tools/mkmsgf/mkmsgf.mk b/tools/mkmsgf/mkmsgf.mk
@@ -4,5 +4,5 @@ PORT_NAME    = tools$(SEP)mkmsgf
 PORT_TYPE    = git
 PORT_URL     = https://github.com/MikeyG/mkmsgf
 PORT_REV     = 1.1
-PORT_PATCHES = mkmsgf.diff mkmsgf2.diff mkmsgf3.diff
+PORT_PATCHES = mkmsgf.diff mkmsgf2.diff mkmsgf3.diff mkmsgf4.diff
 !include $(%ROOT)tools/mk/port.mk
diff --git a/tools/mkmsgf/patches/mkmsgf4.diff b/tools/mkmsgf/patches/mkmsgf4.diff
@@ -0,0 +1,23 @@
+diff -urN mkmsgf/src/mkmsgf.c newmkmsgf/src/mkmsgf.c
+--- mkmsgf/src/mkmsgf.c	Sun Apr 14 12:21:30 2024
++++ newmkmsgf/src/mkmsgf.c	Sun Apr 14 12:20:40 2024
+@@ -905,13 +905,17 @@
+ 					outlen++;
+ 					if (outlen==ASM_MSG_SIZE)
+ 					{
+-						fprintf(fpo, "'\r\n\tDB\t");
+-						if (strncmp("\r\n", readptr, 2)) fprintf(fpo, "'");
++						if (*readptr) fprintf(fpo, "'\r\n\tDB\t");
++						if (strncmp("\r\n", readptr, 2)&& *readptr) fprintf(fpo, "'");
+ 						outlen=0;
+ 					}
+ 				}
+
+ 			}
++
++			// If no EOL, then just close string without 0dh, 0ah
++			if (strncmp("\r\n", readptr-2, 2)) fprintf(fpo,"'");
++			
+ 			fprintf(fpo,"\r\n");
+
+ 			//msg_num_check++;