Header files added. DLGPROC callback functions change of signature.

- malloc/free/realloc/calloc/rand/min/max/qsort required includes with Microsoft Visual Studio Community 2019 Version 16.9.4 - DLGPROC signature return changed to INT_PTR (from BOOL)
onesorzer0es · May 9, 2021 · 57a295b · 57a295b
1 parent a7966f0
commit 57a295b
Show file tree

Hide file tree

Showing 62 changed files with 232 additions and 40 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "windows.h": "c"
+    }
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -617,25 +617,52 @@ add_executable(Metafile WIN32 "Chapter 18 Metafiles/MetaFile/Metafile.c")
 
 # ================================================================== Chapter 19
 
-add_executable(MDIDemo WIN32 "Chapter 19 The Multiple-Document Interface/MDIDemo/MDIDemo.c")
+add_executable(MDIDemo WIN32 "Chapter 19 The Multiple-Document Interface/MDIDemo/MDIDemo.c"
+        "Chapter 19 The Multiple-Document Interface/MDIDemo/Resource.h"
+        "Chapter 19 The Multiple-Document Interface/MDIDemo/MDIDemo.rc")
 
 # ================================================================== Chapter 20
 
 add_executable(BigJob1 WIN32 "Chapter 20 Multitasking and Multithreading/BigJob1/BigJob1.c")
 add_executable(BigJob2 WIN32 "Chapter 20 Multitasking and Multithreading/BigJob2/BigJob2.c")
-
 add_executable(Multi1 WIN32 "Chapter 20 Multitasking and Multithreading/Multi1/Multi1.c")
 add_executable(Multi2 WIN32 "Chapter 20 Multitasking and Multithreading/Multi2/Multi2.c")
+add_executable(RndRctMT WIN32 "Chapter 20 Multitasking and Multithreading/RndRectMT/RndRctMT.c")
 
 # ================================================================== Chapter 21
 
-add_executable(RndRctMT WIN32 "Chapter 20 Multitasking and Multithreading/RndRectMT/RndRctMT.c")
-add_executable(EdrTest WIN32 "Chapter 21 Dynamic-Link Libraries/EdrTest/EdrTest.c"
-        "Chapter 21 Dynamic-Link Libraries/EdrTest/EdrLib.c")
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+add_library(EdrLib SHARED)
+if (WIN32)
+  target_sources(EdrLib PRIVATE "Chapter 21 Dynamic-Link Libraries/EdrTest/EdrLib.c"
+          "Chapter 21 Dynamic-Link Libraries/EdrTest/EdrLib.h")
+#   target_link_libraries()
+endif()
+
+add_executable(EdrTest WIN32 "Chapter 21 Dynamic-Link Libraries/EdrTest/EdrTest.c")
+target_link_libraries(EdrTest EdrLib)
+
+#add_subdirectory("Chapter 21 Dynamic-Link Libraries/EdrTest")
+
 add_executable(ShowBit WIN32 "Chapter 21 Dynamic-Link Libraries/ShowBit/ShowBit.c"
-        "Chapter 21 Dynamic-Link Libraries/ShowBit/BitLib.c")
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/BitLib.c"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Resource.h"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/BitLib.rc"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap1.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap2.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap3.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap4.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap5.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap6.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap7.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap8.bmp"
+        "Chapter 21 Dynamic-Link Libraries/ShowBit/Bitmap9.bmp")
+
 add_executable(StrProg WIN32 "Chapter 21 Dynamic-Link Libraries/StrProg/StrProg.c"
-        "Chapter 21 Dynamic-Link Libraries/StrProg/StrLib.c")
+        "Chapter 21 Dynamic-Link Libraries/StrProg/StrLib.c"
+        "Chapter 21 Dynamic-Link Libraries/StrProg/StrLib.h"
+        "Chapter 21 Dynamic-Link Libraries/StrProg/Resource.h"
+        "Chapter 21 Dynamic-Link Libraries/StrProg/StrProg.rc")
 
 # ================================================================== Chapter 22
 

diff --git a/Chapter 01 Getting Started/01 HelloMsg/HelloMsg.c b/Chapter 01 Getting Started/01 HelloMsg/HelloMsg.c
@@ -5,9 +5,9 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <tchar.h>
+//#include <tchar.h>
 
-int WINAPI _tWinMain(
+int WINAPI WinMain(
 	_In_     HINSTANCE hInstance,
 	_In_opt_ HINSTANCE hPrevInstance,
 	_In_     PTSTR     pCmdLine,

diff --git a/Chapter 06 The Keyboard/05 Typer/Typer.c b/Chapter 06 The Keyboard/05 Typer/Typer.c
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
+#include <malloc.h>
 
 #define BUFFER(x,y) *(pBuffer + y * cxBuffer + x)
 

diff --git a/Chapter 11 Dialog Boxes/About1/About1.c b/Chapter 11 Dialog Boxes/About1/About1.c
@@ -1,4 +1,4 @@
-/*------------------------------------------
+s/*------------------------------------------
    ABOUT1.C -- About Box Demo Program No. 1
 			   (c) Charles Petzold, 1998
    ------------------------------------------*/
@@ -10,7 +10,7 @@
 #include "Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-BOOL    CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM);
 
 int WINAPI _tWinMain(
 	_In_     HINSTANCE hInstance,
@@ -87,7 +87,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-BOOL CALLBACK AboutDlgProc(HWND hDlg, UINT message,
+INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT message,
 	WPARAM wParam, LPARAM lParam)
 {
 	switch (message)

diff --git a/Chapter 11 Dialog Boxes/About2/About2.c b/Chapter 11 Dialog Boxes/About2/About2.c
@@ -9,7 +9,7 @@
 #include "Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-BOOL    CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM);
 
 int iCurrentColor = IDC_BLACK,
 iCurrentFigure = IDC_RECT;
@@ -130,7 +130,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-BOOL CALLBACK AboutDlgProc(HWND hDlg, UINT message,
+INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT message,
 	WPARAM wParam, LPARAM lParam)
 {
 	static HWND hCtrlBlock;

diff --git a/Chapter 11 Dialog Boxes/About3/About3.c b/Chapter 11 Dialog Boxes/About3/About3.c
@@ -9,7 +9,7 @@
 #include "Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-BOOL    CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM);
 LRESULT CALLBACK EllipPushWndProc(HWND, UINT, WPARAM, LPARAM);
 
 int WINAPI _tWinMain(
@@ -100,7 +100,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-BOOL CALLBACK AboutDlgProc(HWND hDlg, UINT message,
+INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT message,
 	WPARAM wParam, LPARAM lParam)
 {
 	switch (message)

diff --git a/Chapter 11 Dialog Boxes/Colors2/Colors2.c b/Chapter 11 Dialog Boxes/Colors2/Colors2.c
@@ -8,7 +8,7 @@
 #include <tchar.h>
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-BOOL    CALLBACK ColorScrDlg(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK ColorScrDlg(HWND, UINT, WPARAM, LPARAM);
 
 HWND hDlgModeless;
 
@@ -83,7 +83,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-BOOL CALLBACK ColorScrDlg(HWND hDlg, UINT message,
+INT_PTR CALLBACK ColorScrDlg(HWND hDlg, UINT message,
 	WPARAM wParam, LPARAM lParam)
 {
 	static int iColor[3];

diff --git a/Chapter 11 Dialog Boxes/PopPad3/PopFile.c b/Chapter 11 Dialog Boxes/PopPad3/PopFile.c
@@ -5,6 +5,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
+#include <malloc.h>
 
 static OPENFILENAME ofn;
 

diff --git a/Chapter 11 Dialog Boxes/PopPad3/PopFind.c b/Chapter 11 Dialog Boxes/PopPad3/PopFind.c
@@ -6,6 +6,7 @@
 #include <windows.h>
 #include <commdlg.h>
 #include <tchar.h>            // for _tcsstr (strstr for Unicode & non-Unicode)
+#include <malloc.h>
 
 #define MAX_STRING_LEN   256
 
@@ -67,7 +68,6 @@ BOOL PopFindFindText(HWND hwndEdit, int* piSearchOffset, LPFINDREPLACE pfr)
 	// Search the document for the find string
 
 	pstrPos = _tcsstr(pstrDoc + *piSearchOffset, pfr->lpstrFindWhat);
-	free(pstrDoc);
 
 	// Return an error code if the string cannot be found
 
@@ -84,6 +84,8 @@ BOOL PopFindFindText(HWND hwndEdit, int* piSearchOffset, LPFINDREPLACE pfr)
 	SendMessage(hwndEdit, EM_SETSEL, iPos, *piSearchOffset);
 	SendMessage(hwndEdit, EM_SCROLLCARET, 0, 0);
 
+	free(pstrDoc);
+
 	return TRUE;
 }
 

diff --git a/Chapter 12 The Clipboard/ClipText/ClipText.c b/Chapter 12 The Clipboard/ClipText/ClipText.c
@@ -6,6 +6,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <tchar.h>
 #include <windows.h>
+#include <malloc.h>
 #include "Resource.h"
 
 LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM) ;

diff --git a/Chapter 13 Using the Printer/FormFeed/GetPrnDC.c b/Chapter 13 Using the Printer/FormFeed/GetPrnDC.c
@@ -5,6 +5,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winspool.h>
+#include <malloc.h>
 
 HDC GetPrinterDC(void)
 {

diff --git a/Chapter 13 Using the Printer/PopPrnt/PopPrnt.c b/Chapter 13 Using the Printer/PopPrnt/PopPrnt.c
@@ -5,12 +5,13 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
+#include <malloc.h>
 #include "Resource.h"
 
 BOOL bUserAbort;
 HWND hDlgPrint;
 
-BOOL CALLBACK PrintDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK PrintDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	UNREFERENCED_PARAMETER(wParam);
 	UNREFERENCED_PARAMETER(lParam);

diff --git a/Chapter 13 Using the Printer/PopPrnt/RCa05108 b/Chapter 13 Using the Printer/PopPrnt/RCa05108
diff --git a/Chapter 13 Using the Printer/Print3/Print3.c b/Chapter 13 Using the Printer/Print3/Print3.c
@@ -17,7 +17,7 @@ TCHAR     szCaption[] = TEXT("Print Program 3 (Dialog Box)");
 BOOL bUserAbort;
 HWND hDlgPrint;
 
-BOOL CALLBACK PrintDlgProc(HWND hDlg, UINT message,
+INT_PTR CALLBACK PrintDlgProc(HWND hDlg, UINT message,
 	WPARAM wParam, LPARAM lParam)
 {
 	switch (message)

diff --git a/Chapter 14 Bitmaps and Bitblts/Scramble/Scramble.c b/Chapter 14 Bitmaps and Bitblts/Scramble/Scramble.c
@@ -6,6 +6,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <tchar.h>
 #include <windows.h>
+#include <stdlib.h>
 
 #define NUM 300
 

diff --git a/Chapter 15 The Device Independent Bitmap/Apollo11/Apollo11.c b/Chapter 15 The Device Independent Bitmap/Apollo11/Apollo11.c
@@ -7,6 +7,8 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
+#include <math.h>
+#include <malloc.h>
 #include "../ShowDib1/DibFile.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);

diff --git a/Chapter 15 The Device Independent Bitmap/DibConv/DibConv.c b/Chapter 15 The Device Independent Bitmap/DibConv/DibConv.c
@@ -8,6 +8,7 @@
 #include <commdlg.h>
 #include <windowsx.h>
 #include <tchar.h>
+#include <malloc.h>
 #include "./Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);

diff --git a/Chapter 15 The Device Independent Bitmap/DibHeads/DibHeads.c b/Chapter 15 The Device Independent Bitmap/DibHeads/DibHeads.c
@@ -7,6 +7,7 @@
 #include <tchar.h>
 #include <windows.h>
 #include <commdlg.h>
+#include <malloc.h>
 #include "./Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);

diff --git a/Chapter 15 The Device Independent Bitmap/DibSect/DibSect.c b/Chapter 15 The Device Independent Bitmap/DibSect/DibSect.c
@@ -8,6 +8,7 @@
 #include <commdlg.h>
 #include <windowsx.h>
 #include <tchar.h>
+#include <malloc.h>
 #include "Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);

diff --git a/Chapter 15 The Device Independent Bitmap/SeqDisp/SeqDisp.c b/Chapter 15 The Device Independent Bitmap/SeqDisp/SeqDisp.c
@@ -7,6 +7,8 @@
 #include <windows.h>
 #include <tchar.h>
 #include <commdlg.h>
+#include <malloc.h>
+#include <math.h>
 #include "./Resource.h"
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);

diff --git a/Chapter 15 The Device Independent Bitmap/ShowDib1/DibFile.c b/Chapter 15 The Device Independent Bitmap/ShowDib1/DibFile.c
@@ -5,6 +5,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
+#include <malloc.h>
 #include "DibFile.h"
 
 static OPENFILENAME ofn;

diff --git a/Chapter 15 The Device Independent Bitmap/ShowDib1/ShowDib1.c b/Chapter 15 The Device Independent Bitmap/ShowDib1/ShowDib1.c
@@ -8,6 +8,8 @@
 #include <windowsx.h>
 #include <tchar.h>
 #include <commdlg.h>
+#include <malloc.h>
+#include <math.h>
 #include "DibFile.h"
 #include "./Resource.h"
 

diff --git a/Chapter 15 The Device Independent Bitmap/ShowDib2/Showdib2.c b/Chapter 15 The Device Independent Bitmap/ShowDib2/Showdib2.c
@@ -8,6 +8,8 @@
 #include <windowsx.h>
 #include <commdlg.h>
 #include <tchar.h>
+#include <malloc.h>
+#include <math.h>
 #include "../ShowDib1/DibFile.h"
 #include "Resource.h"
 

diff --git a/Chapter 16 The Palette Manager/Bounce/Bounce.c b/Chapter 16 The Palette Manager/Bounce/Bounce.c
@@ -5,6 +5,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <malloc.h>
 
 #define ID_TIMER 1
 

diff --git a/Chapter 16 The Palette Manager/Dibble/DibHelp.c b/Chapter 16 The Palette Manager/Dibble/DibHelp.c
@@ -5,6 +5,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <malloc.h>
 #include "DibHelp.h"
 
 #define HDIB_SIGNATURE (* (int *) "Dib ")

diff --git a/Chapter 16 The Palette Manager/Dibble/DibPal.c b/Chapter 16 The Palette Manager/Dibble/DibPal.c
@@ -5,6 +5,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <stdlib.h>
 #include "DibHelp.h"
 #include "DibPal.h"
 

diff --git a/Chapter 16 The Palette Manager/Grays2/Grays2.c b/Chapter 16 The Palette Manager/Grays2/Grays2.c
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
+#include <malloc.h>
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 

diff --git a/Chapter 16 The Palette Manager/Grays3/Grays3.c b/Chapter 16 The Palette Manager/Grays3/Grays3.c
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
+#include <malloc.h>
 
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 

diff --git a/Chapter 16 The Palette Manager/Pipes/Pipes.c b/Chapter 16 The Palette Manager/Pipes/Pipes.c
@@ -5,6 +5,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <malloc.h>
 
 #define ID_TIMER 1
 

diff --git a/Chapter 16 The Palette Manager/ShowDib3/PackeDib.c b/Chapter 16 The Palette Manager/ShowDib3/PackeDib.c
@@ -5,6 +5,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <malloc.h>
+#include <math.h>
 
 /*---------------------------------------------------------
    PackedDibLoad: Load DIB File as Packed-Dib Memory Block

diff --git a/Chapter 16 The Palette Manager/ShowDib3/ShowDib3.c b/Chapter 16 The Palette Manager/ShowDib3/ShowDib3.c
@@ -8,6 +8,7 @@
 #include <windowsx.h>
 #include <tchar.h>
 #include <commdlg.h>
+#include <malloc.h>
 #include "../ShowDib3/PackeDib.h"
 #include "Resource.h"
 

diff --git a/Chapter 16 The Palette Manager/ShowDib4/ShowDib4.c b/Chapter 16 The Palette Manager/ShowDib4/ShowDib4.c
@@ -8,6 +8,7 @@
 #include <windowsx.h>
 #include <tchar.h>
 #include <commdlg.h>
+#include <malloc.h>
 #include "../ShowDib3/PackeDib.h"
 #include "Resource.h"
 

diff --git a/Chapter 16 The Palette Manager/ShowDib5/ShowDib5.c b/Chapter 16 The Palette Manager/ShowDib5/ShowDib5.c
@@ -8,6 +8,7 @@
 #include <windowsx.h>
 #include <tchar.h>
 #include <commdlg.h>
+#include <malloc.h>
 #include "../ShowDib3/PackeDib.h"
 #include "Resource.h"