warnings cleanup, control panel applets information

osfree-project · Apr 25, 2024 · 7473df5 · 7473df5
1 parent bff6164
commit 7473df5
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 18 deletions.
diff --git a/dlls/commdlg/Commdlg.c b/dlls/commdlg/Commdlg.c
@@ -64,8 +64,8 @@ MakeDialogBox(HINSTANCE hInstance, HWND hwndOwner, LPCSTR lpTemplateName,
 	if ( !(hInst = GetModuleHandle("COMMDLG")) )
 		hInst = LoadLibrary("COMMDLG");
 
-	if ( bEnableTemplateHandle ) ;
 /*@ todo
+	if ( bEnableTemplateHandle ) 
 		return InternalDlgIndirectParam(hInst, hInstance, hwndOwner,
 					lpfnDlgProc, (LPARAM)lpCommDlgStruct);
 */

diff --git a/drivers/keyboard/tables/xlat/xlat850/xlat850.asm b/drivers/keyboard/tables/xlat/xlat850/xlat850.asm
@@ -1,5 +1,6 @@
 code	segment
 	org	0h
+start:
 
 tablesize	dw	tableend - tablestart
 
@@ -14,4 +15,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/drivers/keyboard/tables/xlat/xlat852/xlat852.asm b/drivers/keyboard/tables/xlat/xlat852/xlat852.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end start
diff --git a/drivers/keyboard/tables/xlat/xlat855/xlat855.asm b/drivers/keyboard/tables/xlat/xlat855/xlat855.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end 	start
diff --git a/drivers/keyboard/tables/xlat/xlat860/xlat860.asm b/drivers/keyboard/tables/xlat/xlat860/xlat860.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/drivers/keyboard/tables/xlat/xlat861/xlat861.asm b/drivers/keyboard/tables/xlat/xlat861/xlat861.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/drivers/keyboard/tables/xlat/xlat863/xlat866.asm b/drivers/keyboard/tables/xlat/xlat863/xlat866.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/drivers/keyboard/tables/xlat/xlat865/xlat865.asm b/drivers/keyboard/tables/xlat/xlat865/xlat865.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/drivers/keyboard/tables/xlat/xlat866/xlat866.asm b/drivers/keyboard/tables/xlat/xlat866/xlat866.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/drivers/keyboard/tables/xlat/xlat915/xlat915.asm b/drivers/keyboard/tables/xlat/xlat915/xlat915.asm
@@ -1,6 +1,6 @@
 code	segment
 	org	0h
-
+start:
 tablesize	dw	tableend - tablestart
 
 tablestart:
@@ -14,4 +14,4 @@ tableend:
 
 code	ends
 
-end
+end	start
diff --git a/programs/control/applets/main/_wcc.cmd b/programs/control/applets/main/_wcc.cmd
@@ -0,0 +1,9 @@
+@echo off
+set root=.
+:loop
+if exist "%root%\tools\mk\all.mk" goto found
+set root=%root%\..
+goto loop
+:found
+set path=%root%\tools\conf\scripts;%path%
+call build %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/programs/control/applets/main/_wcc.sh b/programs/control/applets/main/_wcc.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+#
+
+export ROOT=.
+while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
+export PATH=$ROOT/tools/conf/scripts:$PATH
+build-lnx.sh $*
diff --git a/programs/control/applets/main/main.c b/programs/control/applets/main/main.c
@@ -0,0 +1,38 @@
+#include <cpl. h>
+typedef struct tagCPLINFO
+{
+	int idIcon;
+	int idName;
+	int idInfo;
+	LONG lData;
+} CPLINFO;
+
+LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2)
+{
+
+    switch (command)
+    {
+        case CPL_INIT:
+            return TRUE;
+
+        case CPL_GETCOUNT:
+            return 1;
+
+        case CPL_INQUIRE:
+        {
+            CPLINFO FAR * appletInfo = (CPLINFO FAR *) lParam2;
+
+            appletInfo->idIcon = ICO_MAIN;
+            appletInfo->idName = IDS_CPL_NAME;
+            appletInfo->idInfo = IDS_CPL_INFO;
+            appletInfo->lData = 0;
+            return TRUE;
+        }
+
+        case CPL_DBLCLK:
+            //display_cpl_sheets(hWnd);
+            break;
+    }
+
+    return FALSE;
+}
diff --git a/programs/control/applets/main/makefile b/programs/control/applets/main/makefile
@@ -0,0 +1,17 @@
+#
+# A Makefile for lzexpand.dll
+# (c) osFree project,
+# author, date
+#
+
+PROJ     = main
+TRGT     = $(PROJ).dll
+DESC     = Main CPL
+srcfiles = $(p)main$(e)
+# linking dll file
+DLL     = 1
+EXPORTS = CPlApplet       .1
+
+DEST = os2$(SEP)mdos$(SEP)winos2$(SEP)system
+
+!include $(%ROOT)tools/mk/appsw16.mk