Static libcommon builds clean up changes to string resources

libcommon string resources were renumbered to avoid collisions with
vcc resources then the strings were copied into vcc.rc so they are
availiable for cart load error messages.

Author: ejaquay

Vcc.cpp

@@ -133,6 +133,7 @@ bool IsShiftKeyDown();
 
 CartridgeMenu CartMenu;
 
+void InitStaticModuleInstance(HINSTANCE hInstance);
 
 //static CRITICAL_SECTION  FrameRender;
 /*--------------------------------------------------------------------------*/
@@ -149,8 +150,10 @@ int APIENTRY WinMain(_In_ HINSTANCE hInstance,
 	OleInitialize(nullptr); //Work around fixs app crashing in "Open file" system dialogs (related to Adobe acrobat 7+
 	LoadString(hInstance, IDS_APP_TITLE,g_szAppName, MAX_LOADSTRING);
 
-// Init static libcommon
-void InitStaticModuleInstance();
+#ifdef USE_STATIC_LIB
+	// Init static libcommon
+	InitStaticModuleInstance(hInstance);
+#endif
 
 	// Parse command line
 	memset(&CmdArg,0,sizeof(CmdArg));

Vcc.rc

@@ -827,16 +827,17 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// String Table
-//
+// String Table. ** Resources are being used by libcommon.rc!! **
+// These strings are duplicated for Vcc.exe so they are available for
+// static builds. libcommon should not use these because resources are
+// not a thing with static builds - they can not be contained in a static
+// object library.
 
 STRINGTABLE
 BEGIN
     IDS_APP_TITLE           "VCC 2.1.9.3-pre3 Tandy Color Computer 3 Emulator"
     IDS_CATNUMBER           "26-3334"
-
-// FIXME
-#ifdef USE_STATIC_LIB
+    // Strings for error messages FIXME: duplicated in libcommon
     IDS_ERROR_UNKNOWN                  "Unknown error."
     IDS_ERROR_CARTRIDGE_ALREADY_LOADED "Cartridge is already loaded."
     IDS_ERROR_CARTRIDGE_CANNOT_OPEN    "Cannot open cartridge."
@@ -845,7 +846,6 @@ BEGIN
     IDS_ERROR_CARTRIDGE_NOT_ROM        "Cartridge is not a valid ROM image."
     IDS_ERROR_CARTRIDGE_NOT_EXPANSION  "Cartridge is not a valid expansion plugin."
     IDS_ERROR_CARTRIDGE_API_NOT_SUPPORTED "Cartridge is using an API that is no longer supported."
-#endif
 
 END
 

libcommon/resource/resource.h

@@ -1,9 +1,9 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by libcommon.rc
 //
-// FIXME
-#ifdef USE_STATIC_LIB
+// These resources were renumbered to avoid collision with Vcc.exe
+// resources for static builds.
+//
 #define IDS_ERROR_UNKNOWN                     501
 #define IDS_ERROR_CARTRIDGE_ALREADY_LOADED    502
 #define IDS_ERROR_CARTRIDGE_CANNOT_OPEN       503
@@ -12,16 +12,6 @@
 #define IDS_ERROR_CARTRIDGE_NOT_ROM           506
 #define IDS_ERROR_CARTRIDGE_NOT_EXPANSION     507
 #define IDS_ERROR_CARTRIDGE_API_NOT_SUPPORTED 508
-#else
-#define IDS_ERROR_UNKNOWN                     101
-#define IDS_ERROR_CARTRIDGE_ALREADY_LOADED    102
-#define IDS_ERROR_CARTRIDGE_CANNOT_OPEN       103
-#define IDS_ERROR_CARTRIDGE_NOT_FOUND         104
-#define IDS_ERROR_CARTRIDGE_NOT_LOADED        105
-#define IDS_ERROR_CARTRIDGE_NOT_ROM           106
-#define IDS_ERROR_CARTRIDGE_NOT_EXPANSION     107
-#define IDS_ERROR_CARTRIDGE_API_NOT_SUPPORTED 108
-#endif
 
 // Next default values for new objects
 // 

libcommon/src/main.cpp

@@ -4,7 +4,12 @@
 
 HINSTANCE gModuleInstance = nullptr;
 
-#ifndef USE_STATIC_LIB
+#ifdef USE_STATIC_LIB
+// Static library has no DLLmain but may require caller's hInstance
+void InitStaticModuleInstance(HINSTANCE hInstance) {
+    gModuleInstance = hInstance;
+}
+#else
 BOOL APIENTRY DllMain(HMODULE module_handle, DWORD  reason, LPVOID reserved)
 {
     if(reason == DLL_PROCESS_ATTACH)
@@ -14,8 +19,4 @@ BOOL APIENTRY DllMain(HMODULE module_handle, DWORD  reason, LPVOID reserved)
 
 	return TRUE;
 }
-#else
-void InitStaticModuleInstance(HINSTANCE hInstance) {
-    gModuleInstance = hInstance;
-}
 #endif

resource.h

@@ -6,7 +6,7 @@
 #define IDS_CATNUMBER                   2
 #define IDAPPLY                         3
 #define IDOK2                           3
-
+//
 #define IDS_UNKNOWN_ERROR               3
 #define IDS_MODULE_ALREADY_LOADED       4
 #define IDS_MODULE_CANNOT_OPEN          5
@@ -15,18 +15,6 @@
 #define IDS_MODULE_NOT_ROM              8
 #define IDS_MODULE_NOT_EXPANSION        9
 
-// FIXME
-#ifdef USE_STATIC_LIB
-#define IDS_ERROR_UNKNOWN                     501
-#define IDS_ERROR_CARTRIDGE_ALREADY_LOADED    502
-#define IDS_ERROR_CARTRIDGE_CANNOT_OPEN       503
-#define IDS_ERROR_CARTRIDGE_NOT_FOUND         504
-#define IDS_ERROR_CARTRIDGE_NOT_LOADED        505
-#define IDS_ERROR_CARTRIDGE_NOT_ROM           506
-#define IDS_ERROR_CARTRIDGE_NOT_EXPANSION     507
-#define IDS_ERROR_CARTRIDGE_API_NOT_SUPPORTED 508
-#endif
-
 #define IDR_MENU                        101
 #define IDI_COCO3                       103
 #define IDD_ABOUTBOX                    104
@@ -73,6 +61,16 @@
 #define IDB_FONT_CONSOLA                178
 #define IDD_FUNCTION_KEYS               179
 
+// error string resources FIXME: duplicated in libcommon
+#define IDS_ERROR_UNKNOWN                     501
+#define IDS_ERROR_CARTRIDGE_ALREADY_LOADED    502
+#define IDS_ERROR_CARTRIDGE_CANNOT_OPEN       503
+#define IDS_ERROR_CARTRIDGE_NOT_FOUND         504
+#define IDS_ERROR_CARTRIDGE_NOT_LOADED        505
+#define IDS_ERROR_CARTRIDGE_NOT_ROM           506
+#define IDS_ERROR_CARTRIDGE_NOT_EXPANSION     507
+#define IDS_ERROR_CARTRIDGE_API_NOT_SUPPORTED 508
+
 #define IDC_MUTE                        1003
 #define IDC_THROTTLE                    1004
 #define IDC_ARTIFACTS                   1005
@@ -477,9 +475,9 @@
 #define IDM_HELP_FUNKEY                 40059
 #define ID_CONFIGURE_OPTIONS            65535
 
-
 // Next default values for new objects
-//
+// Caution: error strings resources start at 501
+
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        180