[ros-diffs] [hbelusca] 61227: [ROSAPPS] Remove the legacy directory.rbuild file. [VGAFONTEDIT] - Add necessary headers definitions for CPI font files. - Add some (unused for now) PSFv1 definitions. - Add a (un...

Author: hbelusca
Date: Thu Dec  5 02:19:57 2013
New Revision: 61227

URL: http://svn.reactos.org/svn/reactos?rev=61227&view=rev
Log:
[ROSAPPS]
Remove the legacy directory.rbuild file.

[VGAFONTEDIT]
- Add necessary headers definitions for CPI font files.
- Add some (unused for now) PSFv1 definitions.
- Add a (unused for now) VGAFONT structure that defines whether the font is stored as RAW,
CPI or PSF.

Removed:
    trunk/rosapps/directory.rbuild
Modified:
    trunk/rosapps/CMakeLists.txt
    trunk/rosapps/applications/devutils/vgafontedit/cpi.h
    trunk/rosapps/applications/devutils/vgafontedit/precomp.h
    trunk/rosapps/applications/devutils/vgafontedit/psf.h

Modified: trunk/rosapps/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/CMakeLists.txt?rev=61227&a…
==============================================================================
--- trunk/rosapps/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/CMakeLists.txt	[iso-8859-1] Thu Dec  5 02:19:57 2013
@@ -1,3 +1,4 @@
 add_subdirectory(applications)
 add_subdirectory(demos)
-add_subdirectory(drivers)
+add_subdirectory(drivers)
+# add_subdirectory(lib)

Modified: trunk/rosapps/applications/devutils/vgafontedit/cpi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/cpi.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/cpi.h	[iso-8859-1] Thu Dec  5 02:19:57
2013
@@ -3,10 +3,51 @@
  * LICENSE:     GNU General Public License Version 2.0 or any later version
  * FILE:        devutils/vgafontedit/cpi.h
  * PURPOSE:     CPI (Code Page Information) MS-DOS-compatible Fonts
+ *              We support only screen fonts, not printer fonts.
+ *              No DR-DOS/Novell-DOS compressed font format support.
  * COPYRIGHT:   Copyright 2014 Hermes Belusca-Maito <hermes.belusca(a)sfr.fr>
  */
 
 #ifndef __CPI_H
 #define __CPI_H
 
+typedef struct _CPI_HEADER
+{
+    UCHAR   uId0;
+    UCHAR   uId[7];
+    UCHAR   uReserved[8];
+    USHORT  uNumPtr;
+    UCHAR   uPtrType;
+    ULONG   uFntInfoHdrOffset;
+
+    // FIXME: Put it in another struct ??
+    USHORT  uNumCodePages;
+} CPI_HEADER, *PCPI_HEADER;
+
+typedef struct _CPENTRY_HEADER
+{
+    USHORT  uHdrSize;
+    ULONG   uNextCPEHOffset;
+    USHORT  uDeviceType;
+    UCHAR   uDeviceName[8];
+    USHORT  uCodePage;
+    UCHAR   uReserved[6];
+    ULONG   uCPIHOffset;
+} CPENTRY_HEADER, *PCPENTRY_HEADER;
+
+typedef struct _CPINFO_HEADER
+{
+    USHORT  uVersion;
+    USHORT  uNumFonts;
+    USHORT  uSize;  // uFontSize
+} CPINFO_HEADER, *PCPINFO_HEADER;
+
+typedef struct _SCRFONT_HEADER
+{
+    UCHAR   uHeight;
+    UCHAR   uWidth;
+    USHORT  uReserved;
+    USHORT  uNumChars;
+} SCRFONT_HEADER, *PSCRFONT_HEADER;
+
 #endif

Modified: trunk/rosapps/applications/devutils/vgafontedit/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/precomp.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/precomp.h	[iso-8859-1] Thu Dec  5
02:19:57 2013
@@ -16,8 +16,21 @@
 #include "customwndclasses.h"
 
 #include "raw.h"
+#include "cpi.h"
 #include "psf.h"
-#include "cpi.h"
+
+typedef enum
+{
+    RAW,
+    CPI,
+    PSF
+} VGAFONT_TYPE;
+
+typedef struct _VGAFONT
+{
+    VGAFONT_TYPE FontType;
+    PVOID        FontPtr;
+} VGAFONT, *PVGAFONT;
 
 // Forward declarations
 typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO;

Modified: trunk/rosapps/applications/devutils/vgafontedit/psf.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/psf.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/psf.h	[iso-8859-1] Thu Dec  5 02:19:57
2013
@@ -9,8 +9,16 @@
 #ifndef __PSF_H
 #define __PSF_H
 
-#define PSF1_MAGIC0                   0x36
-#define PSF1_MAGIC1                   0x04
+#define PSF1_MAGIC0     0x36
+#define PSF1_MAGIC1     0x04
+
+#define PSF1_MODE512    0x01
+#define PSF1_MODEHASTAB 0x02
+#define PSF1_MODEHASSEQ 0x04
+#define PSF1_MAXMODE    0x05
+
+#define PSF1_SEPARATOR  0xFFFF
+#define PSF1_STARTSEQ   0xFFFE
 
 typedef struct _PSF1_HEADER
 {

Removed: trunk/rosapps/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=61226
==============================================================================
--- trunk/rosapps/directory.rbuild	[iso-8859-1] (original)
+++ trunk/rosapps/directory.rbuild	(removed)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="applications">
-		<xi:include href="applications/applications.rbuild" />
-	</directory>
-
-	<directory name="demos">
-		<xi:include href="demos/directory.rbuild" />
-	</directory>
-
-	<directory name="drivers">
-		<xi:include href="drivers/directory.rbuild" />
-	</directory>
-	
-	<directory name="lib">
-		<xi:include href="lib/directory.rbuild" />
-	</directory>
-</group>