Release

Neatpad02/Neatpad/resource.h

@@ -2,21 +2,21 @@
 // Microsoft Developer Studio generated include file.
 // Used by resource.rc
 //
-#define IDR_MENU1                       101
-#define IDI_ICON1                       102
-#define IDR_ACCELERATOR1                103
-#define IDM_FILE_NEW                    40001
-#define IDM_FILE_OPEN                   40002
-#define IDM_FILE_EXIT                   40003
-#define IDM_HELP_ABOUT                  40004
+#define IDR_MENU1 101
+#define IDI_ICON1 102
+#define IDR_ACCELERATOR1 103
+#define IDM_FILE_NEW 40001
+#define IDM_FILE_OPEN 40002
+#define IDM_FILE_EXIT 40003
+#define IDM_HELP_ABOUT 40004
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        104
-#define _APS_NEXT_COMMAND_VALUE         40005
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
+#define _APS_NEXT_RESOURCE_VALUE 104
+#define _APS_NEXT_COMMAND_VALUE 40005
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
 #endif
 #endif

Neatpad02/TextView/TextDocument.h

@@ -14,7 +14,8 @@ void TextDocument__delete(TEXTDOCUMENT *ptd);
 BOOL TextDocument__init(TEXTDOCUMENT *ptd, HANDLE hFile);
 BOOL TextDocument__init_filename(TEXTDOCUMENT *ptd, char *filename);
 BOOL TextDocument__clear(TEXTDOCUMENT *ptd);
-ULONG TextDocument__getline(TEXTDOCUMENT *ptd, ULONG lineno, char *buf, size_t len);
+ULONG TextDocument__getline(TEXTDOCUMENT *ptd, ULONG lineno, char *buf,
+                            size_t len);
 ULONG TextDocument__linecount(TEXTDOCUMENT *ptd);
 ULONG TextDocument__longestline(TEXTDOCUMENT *ptd);
 // private

Neatpad02/TextView/TextViewInternal.h

@@ -28,7 +28,7 @@ LONG TextView__ClearFile(TEXTVIEW *ptv);
 // private
 void TextView__PaintLine(TEXTVIEW *ptv, HDC hdc, ULONG line);
 void TextView__TabbedExtTextOut(TEXTVIEW *ptv, HDC hdc, RECT *rect, TCHAR *buf,
-                                 int len);
+                                int len);
 COLORREF TextView__GetTextViewColor(TEXTVIEW *ptv, UINT idx);
 
 #endif

Neatpad02/TextView/TextViewPaint.c

@@ -48,7 +48,7 @@ LONG TextView__OnPaint(TEXTVIEW *ptv)
 //	Emulates ExtTextOut, but draws text using tabs using TabbedTextOut
 //
 void TextView__TabbedExtTextOut(TEXTVIEW *ptv, HDC hdc, RECT *rect, TCHAR *buf,
-                                 int len)
+                                int len)
 {
     int tab = 4 * ptv->m_nFontWidth;
     int width;

Neatpad03/TextView/TextView.c

@@ -9,7 +9,6 @@
 #include <tchar.h>
 #include <windows.h>
 
-
 #include "TextView.h"
 #include "TextViewInternal.h"
 

Neatpad06/Neatpad/Neatpad.ppj

@@ -101,6 +101,8 @@ output\OptionsMisc.obj: \
 # 
 output\resource.res: \
 	resource.rc \
+	icon1.ico \
+	icon2.ico \
 	resource.h
 	$(RC) $(RCFLAGS) "$!" -Fo"$@"
 

Neatpad06/TextView/TextViewFont.c

@@ -257,7 +257,7 @@ LONG TextView__AddFont(TEXTVIEW *ptv, HFONT hFont)
 }
 
 //
-//	Wptv->m_SETFONT handler: set a new default font
+//	WM_SETFONT handler: set a new default font
 //
 LONG TextView__OnSetFont(TEXTVIEW *ptv, HFONT hFont)
 {

Neatpad06/TextView/TextViewMouse.c

@@ -14,7 +14,7 @@
 int ScrollDir(int counter, int dir);
 
 //
-//	Wptv->m_MOUSEACTIVATE
+//	WM_MOUSEACTIVATE
 //
 //	Grab the keyboard input focus
 //
@@ -26,7 +26,7 @@ LONG TextView__OnMouseActivate(TEXTVIEW *ptv, HWND hwndTop, UINT nHitTest,
 }
 
 //
-//	Wptv->m_LBUTTONDOWN
+//	WM_LBUTTONDOWN
 //
 //  Position caret to nearest text character under mouse
 //
@@ -60,7 +60,7 @@ LONG TextView__OnLButtonDown(TEXTVIEW *ptv, UINT nFlags, int mx, int my)
 }
 
 //
-//	Wptv->m_LBUTTONUP
+//	WM_LBUTTONUP
 //
 //	Release capture and cancel any mouse-scrolling
 //
@@ -81,7 +81,7 @@ LONG TextView__OnLButtonUp(TEXTVIEW *ptv, UINT nFlags, int mx, int my)
 }
 
 //
-//	Wptv->m_MOUSEMOVE
+//	WM_MOUSEMOVE
 //
 //	Set the selection end-point if we are dragging the mouse
 //
@@ -136,7 +136,7 @@ LONG TextView__OnMouseMove(TEXTVIEW *ptv, UINT nFlags, int mx, int my)
 }
 
 //
-//	Wptv->m_TIMER handler
+//	WM_TIMER handler
 //
 //	Used to create regular scrolling
 //
@@ -184,13 +184,13 @@ LONG TextView__OnTimer(TEXTVIEW *ptv, UINT nTimerId)
     // pointing to the right places and the scroll positions are valid.
     //
     if (hrgnUpdate != NULL) {
-        // We perform a "fake" Wptv->m_MOUSEMOVE for two reasons:
+        // We perform a "fake" WM_MOUSEMOVE for two reasons:
         //
         // 1. To get the cursor/caret/selection offsets set to the correct place
         //    *before* we redraw (so everything is synchronized correctly)
         //
         // 2. To invalidate any areas due to mouse-movement which won't
-        //    get done until the next Wptv->m_MOUSEMOVE - and then it would
+        //    get done until the next WM_MOUSEMOVE - and then it would
         //    be too late because we need to redraw *now*
         //
         TextView__OnMouseMove(ptv, 0, pt.x, pt.y);
@@ -199,12 +199,12 @@ LONG TextView__OnTimer(TEXTVIEW *ptv, UINT nTimerId)
         InvalidateRgn(ptv->m_hWnd, hrgnUpdate, FALSE);
         DeleteObject(hrgnUpdate);
 
-        // the next time we process Wptv->m_PAINT everything
+        // the next time we process WM_PAINT everything
         // should get drawn correctly!!
         UpdateWindow(ptv->m_hWnd);
     }
 
-    // keep track of how many Wptv->m_TIMERs we process because
+    // keep track of how many WM_TIMERs we process because
     // we might want to skip the next one
     ptv->m_nScrollCounter++;
 

Neatpad07/Neatpad/Neatpad.ppj

@@ -128,6 +128,9 @@ output\Printing.obj: \
 # 
 output\resource.res: \
 	resource.rc \
+	bitmap1.bmp \
+	icon1.ico \
+	icon2.ico \
 	resource.h
 	$(RC) $(RCFLAGS) "$!" -Fo"$@"
 

Neatpad07/Neatpad/Neatpad64.ppj

@@ -128,6 +128,9 @@ output\Printing64.obj: \
 # 
 output\resource64.res: \
 	resource.rc \
+	bitmap1.bmp \
+	icon1.ico \
+	icon2.ico \
 	resource.h
 	$(RC) $(RCFLAGS) "$!" -Fo"$@"
 

Neatpad09/Neatpad/Neatpad.ppj

@@ -128,6 +128,10 @@ output\Printing.obj: \
 # 
 output\resource.res: \
 	resource.rc \
+	bitmap1.bmp \
+	icon1.ico \
+	icon2.ico \
+	Neatpad.exe.manifest \
 	resource.h
 	$(RC) $(RCFLAGS) "$!" -Fo"$@"
 

Neatpad15/Neatpad/Neatpad.ppj

@@ -128,6 +128,11 @@ output\Printing.obj: \
 # 
 output\resource.res: \
 	resource.rc \
+	bitmap1.bmp \
+	icon1.ico \
+	icon2.ico \
+	icon3.ico \
+	Neatpad.exe.manifest \
 	resource.h
 	$(RC) $(RCFLAGS) "$!" -Fo"$@"
 

Neatpad15/Neatpad/OptionsMisc.c

@@ -6,16 +6,17 @@
 //
 #include <windows.h>
 
-#include "Neatpad.h"
-#include "resource.h"
 #include <commctrl.h>
 #include <shellapi.h>
 
+#include "Neatpad.h"
+#include "resource.h"
+
 //
 //	Dialogbox procedure for the FONT pane
 //
 INT_PTR CALLBACK MiscOptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam,
-                                 LPARAM lParam)
+                                    LPARAM lParam)
 {
     PSHNOTIFY *pshn;
 

Neatpad15/TextView/TextView.ppj

@@ -95,7 +95,8 @@ output\TextViewFont.obj: \
 	codepages.h \
 	TextDocument.h \
 	TextView.h \
-	TextViewInternal.h
+	TextViewInternal.h \
+	..\UspLib\usplib.h
 	$(CC) $(CCFLAGS) "$!" -Fo"$@"
 
 # 
@@ -130,7 +131,8 @@ output\TextViewScroll.obj: \
 	codepages.h \
 	TextDocument.h \
 	TextView.h \
-	TextViewInternal.h
+	TextViewInternal.h \
+	..\UspLib\usplib.h
 	$(CC) $(CCFLAGS) "$!" -Fo"$@"
 
 # 

Neatpad15/TextView/TextViewInternal.h

@@ -137,7 +137,8 @@ typedef struct {
 TEXTVIEW *TextView__new(HWND hwnd);
 void TextView__delete(TEXTVIEW *ptv);
 
-LONG WINAPI TextView__WndProc(TEXTVIEW *ptv, UINT msg, WPARAM wParam, LPARAM lParam);
+LONG WINAPI TextView__WndProc(TEXTVIEW *ptv, UINT msg, WPARAM wParam,
+                              LPARAM lParam);
 
 // private
 //
@@ -151,7 +152,8 @@ LONG TextView__OnHScroll(TEXTVIEW *ptv, UINT nSBCode, UINT nPos);
 LONG TextView__OnMouseWheel(TEXTVIEW *ptv, int nDelta);
 LONG TextView__OnTimer(TEXTVIEW *ptv, UINT nTimer);
 
-LONG TextView__OnMouseActivate(TEXTVIEW *ptv, HWND hwndTop, UINT nHitTest, UINT nMessage);
+LONG TextView__OnMouseActivate(TEXTVIEW *ptv, HWND hwndTop, UINT nHitTest,
+                               UINT nMessage);
 LONG TextView__OnLButtonDown(TEXTVIEW *ptv, UINT nFlags, int x, int y);
 LONG TextView__OnLButtonUp(TEXTVIEW *ptv, UINT nFlags, int x, int y);
 LONG TextView__OnMouseMove(TEXTVIEW *ptv, UINT nFlags, int x, int y);
@@ -176,17 +178,21 @@ COLORREF TextView__SetColour(TEXTVIEW *ptv, UINT idx, COLORREF rgbColour);
 //
 //	Private Helper functions
 //
-void TextView__PaintLine(TEXTVIEW *ptv, HDC hdc, ULONG line, int x, int y, HRGN hrgnUpdate);
-void TextView__PaintText(TEXTVIEW *ptv, HDC hdc, ULONG nLineNo, int x, int y, RECT *bounds);
+void TextView__PaintLine(TEXTVIEW *ptv, HDC hdc, ULONG line, int x, int y,
+                         HRGN hrgnUpdate);
+void TextView__PaintText(TEXTVIEW *ptv, HDC hdc, ULONG nLineNo, int x, int y,
+                         RECT *bounds);
 int TextView__PaintMargin(TEXTVIEW *ptv, HDC hdc, ULONG line, int x, int y);
 
-int TextView__ApplyTextAttributes(TEXTVIEW *ptv, ULONG nLineNo, ULONG offset, ULONG *nColumn,
-                        TCHAR *szText, int nTextLen, ATTR *attr);
+int TextView__ApplyTextAttributes(TEXTVIEW *ptv, ULONG nLineNo, ULONG offset,
+                                  ULONG *nColumn, TCHAR *szText, int nTextLen,
+                                  ATTR *attr);
 void TextView__RefreshWindow(TEXTVIEW *ptv);
 LONG TextView__InvalidateRange(TEXTVIEW *ptv, ULONG nStart, ULONG nFinish);
 LONG TextView__InvalidateLine(TEXTVIEW *ptv, ULONG nLineNo, BOOL forceAnalysis);
 VOID TextView__UpdateLine(TEXTVIEW *ptv, ULONG nLineNo);
-int TextView__SyntaxColour(TEXTVIEW *ptv, TCHAR *szText, ULONG nTextLen, ATTR *attr);
+int TextView__SyntaxColour(TEXTVIEW *ptv, TCHAR *szText, ULONG nTextLen,
+                           ATTR *attr);
 
 int TextView__NeatTextYOffset(TEXTVIEW *ptv, USPFONT *font);
 int TextView__TextWidth(TEXTVIEW *ptv, HDC hdc, TCHAR *buf, int len);
@@ -196,8 +202,9 @@ void TextView__UpdateMarginWidth(TEXTVIEW *ptv);
 int TextView__SetCaretWidth(TEXTVIEW *ptv, int nWidth);
 BOOL TextView__SetImageList(TEXTVIEW *ptv, HIMAGELIST hImgList);
 
-BOOL TextView__MouseCoordToFilePos(TEXTVIEW *ptv, int x, int y, ULONG *pnLineNo, ULONG *pnFileOffset,
-                         int *px); //, ULONG *pnLineLen=0);
+BOOL TextView__MouseCoordToFilePos(TEXTVIEW *ptv, int x, int y, ULONG *pnLineNo,
+                                   ULONG *pnFileOffset,
+                                   int *px); //, ULONG *pnLineLen=0);
 ULONG TextView__RepositionCaret(TEXTVIEW *ptv);
 VOID TextView__MoveCaret(TEXTVIEW *ptv, int x, int y);
 
@@ -215,7 +222,8 @@ COLORREF TextView__LongColour(TEXTVIEW *ptv, ULONG nLineNo);
 
 int TextView__SetLineImage(TEXTVIEW *ptv, ULONG nLineNo, ULONG nImageIdx);
 LINEINFO *TextView__GetLineInfo(TEXTVIEW *ptv, ULONG nLineNo);
-int TextView__StripCRLF(TEXTVIEW *ptv, TCHAR *szText, ATTR *attrList, int nLength, BOOL fAllow);
+int TextView__StripCRLF(TEXTVIEW *ptv, TCHAR *szText, ATTR *attrList,
+                        int nLength, BOOL fAllow);
 
 VOID TextView__SetupScrollbars(TEXTVIEW *ptv);
 VOID TextView__UpdateMetrics(TEXTVIEW *ptv);
@@ -228,6 +236,7 @@ HRGN TextView__ScrollRgn(TEXTVIEW *ptv, int dx, int dy, BOOL fReturnUpdateRgn);
 void TextView__ResetLineCache(TEXTVIEW *ptv);
 
 USPDATA *TextView__GetUspData(TEXTVIEW *ptv, HDC hdc, ULONG nLineNo);
-USPDATA *TextView__GetUspData_offset(TEXTVIEW *ptv, HDC hdc, ULONG nLineNo, ULONG *off_chars);
+USPDATA *TextView__GetUspData_offset(TEXTVIEW *ptv, HDC hdc, ULONG nLineNo,
+                                     ULONG *off_chars);
 
 #endif

Neatpad16/Neatpad/Neatpad.ppj

@@ -128,6 +128,11 @@ output\Printing.obj: \
 # 
 output\resource.res: \
 	resource.rc \
+	bitmap1.bmp \
+	icon1.ico \
+	icon2.ico \
+	icon3.ico \
+	Neatpad.exe.manifest \
 	resource.h
 	$(RC) $(RCFLAGS) "$!" -Fo"$@"
 

Neatpad16/Neatpad/OptionsFont.c

@@ -23,7 +23,7 @@ static HFONT g_hBoldFont;
 static HFONT g_hNormalFont;
 static HICON g_hIcon2; // TrueType icon
 static HICON g_hIcon3; // OpenType icon
-static int g_nFontHeight;
+// static int g_nFontHeight;
 
 static COLORREF g_crPreviewFG;
 static COLORREF g_crPreviewBG;

Neatpad16/TextView/TextDocument.c

@@ -313,7 +313,7 @@ BOOL TextDocument__init_linebuffer(TEXTDOCUMENT *ptd)
     ULONG offset_chars = 0;
     ULONG linestart_bytes = 0;
     ULONG linestart_chars = 0;
-    ULONG bytes_left = ptd->length_bytes - ptd->headersize;
+    // ULONG bytes_left = ptd->length_bytes - ptd->headersize;
 
     ULONG buflen = ptd->length_bytes - ptd->headersize;
 

Neatpad16/TextView/TextView.ppj

@@ -44,16 +44,16 @@ POC_PROJECT_ZIPEXTRA = #
 TextView.lib: \
 	output\TextDocument.obj \
 	output\TextView.obj \
+	output\TextViewClipboard.obj \
 	output\TextViewFile.obj \
 	output\TextViewFont.obj \
+	output\TextViewKeyNav.obj \
 	output\TextViewMouse.obj \
 	output\TextViewPaint.obj \
-	output\TextViewScroll.obj \
-	output\Unicode.obj \
-	output\TextViewClipboard.obj \
-	output\TextViewKeyNav.obj \
 	output\TextViewParser.obj \
+	output\TextViewScroll.obj \
 	output\TextViewSyntax.obj \
+	output\Unicode.obj \
 	output\Uniscribe.obj
 	$(AR) $(ARFLAGS) -out:"$@" $**
 
@@ -100,7 +100,8 @@ output\TextViewFont.obj: \
 	codepages.h \
 	TextDocument.h \
 	TextView.h \
-	TextViewInternal.h
+	TextViewInternal.h \
+	..\UspLib\usplib.h
 	$(CC) $(CCFLAGS) "$!" -Fo"$@"
 
 # 
@@ -135,7 +136,8 @@ output\TextViewScroll.obj: \
 	codepages.h \
 	TextDocument.h \
 	TextView.h \
-	TextViewInternal.h
+	TextViewInternal.h \
+	..\UspLib\usplib.h
 	$(CC) $(CCFLAGS) "$!" -Fo"$@"
 
 #