fix: address PR #101 review comments

- win32_profile.mm: guard nSize==0 underflow in GetPrivateProfileStringW;
  implement NULL lpString delete semantics in WritePrivateProfileStringW
  per Win32 API contract
- nppm_handler.mm: use bounded wcsncpy instead of wcscpy in
  NPPM_GETFULLPATHFROMBUFFERID to prevent buffer overflow
- winuser.h: SendInput stub returns nInputs (success) instead of 0
  (failure) so callers don't disable features
- winbase.h/tchar.h: deduplicate safe CRT shims (_wfopen_s, _itow_s,
  _snwprintf_s) — single definition in winbase.h behind
  SHIM_HAS_SAFE_CRT guard
- compare-plus-host-inventory.md: update status to reflect Phase 1
  implementations (all Tier 1 messages now implemented)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Hybrid Machine

docs/compare-plus-host-inventory.md

@@ -1,42 +1,43 @@
 # ComparePlus Host-Surface Inventory
 
-Generated as part of Phase 0, Issue #100.
+Generated as part of Phase 0, Issue #100. Updated after Phase 1 implementation.
 
-## Tier 1: Blocks Basic Compare (MUST implement first)
+## Tier 1: Blocks Basic Compare
 
 | Message | Used In | Host Status |
 |---------|---------|-------------|
-| `NPPM_GETCURRENTBUFFERID` | NppHelpers.h:473 | **NOT IMPLEMENTED** |
-| `NPPM_GETPOSFROMBUFFERID` | NppHelpers.h:459,466; NppHelpers.cpp:302 | **NOT IMPLEMENTED** |
-| `NPPM_GETBUFFERIDFROMPOS` | NppHelpers.cpp:508,516 | **NOT IMPLEMENTED** |
-| `NPPM_GETFULLPATHFROMBUFFERID` | Compare.h:77; NppHelpers.cpp:509,511,517,519; Compare.cpp:1135 | **NOT IMPLEMENTED** |
-| `NPPM_DOOPEN` | Compare.cpp:2983 | **NOT IMPLEMENTED** |
-| `NPPM_SWITCHTOFILE` | Compare.cpp:5108,5113 | **NOT IMPLEMENTED** |
-| `NPPM_SETBUFFERLANGTYPE` | Compare.cpp (createTempFile) | **NOT IMPLEMENTED** |
-| `NPPM_GETBUFFERLANGTYPE` | Compare.cpp (createTempFile) | **NOT IMPLEMENTED** |
-| `NPPN_BUFFERACTIVATED` | Compare.cpp (onBufferActivated) | **NOT EMITTED** |
+| `NPPM_GETCURRENTBUFFERID` | NppHelpers.h:473 | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_GETPOSFROMBUFFERID` | NppHelpers.h:459,466; NppHelpers.cpp:302 | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_GETBUFFERIDFROMPOS` | NppHelpers.cpp:508,516 | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_GETFULLPATHFROMBUFFERID` | Compare.h:77; NppHelpers.cpp:509,511,517,519; Compare.cpp:1135 | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_DOOPEN` | Compare.cpp:2983 | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_SWITCHTOFILE` | Compare.cpp:5108,5113 | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_SETBUFFERLANGTYPE` | Compare.cpp (createTempFile) | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPM_GETBUFFERLANGTYPE` | Compare.cpp (createTempFile) | **IMPLEMENTED** (nppm_handler.mm) |
+| `NPPN_BUFFERACTIVATED` | Compare.cpp (onBufferActivated) | **EMITTED** (document_manager.mm) |
 
 ## Tier 2: Blocks UI/Toolbar
 
 | Message | Used In | Host Status |
 |---------|---------|-------------|
 | `NPPM_ADDTOOLBARICON_FORDARKMODE` | Compare.cpp (onToolBarReady) | **NOT IMPLEMENTED** |
 | `NPPM_HIDETABBAR` | Compare.cpp (5 calls) | **NOT IMPLEMENTED** |
-| `NPPM_GETMENUHANDLE` | Compare.cpp (NppState, 8 calls) | **NOT IMPLEMENTED** |
+| `NPPM_GETMENUHANDLE` | Compare.cpp (NppState, 8 calls) | **IMPLEMENTED** (nppm_handler.mm) |
 | `NPPM_DMMREGASDCKDLG` | NavDialog.cpp | **NOT IMPLEMENTED** |
 | `NPPM_DMMSHOW` / `NPPM_DMMHIDE` | NavDialog.cpp | **NOT IMPLEMENTED** |
-| `NPPN_TBMODIFICATION` | Compare.cpp (onToolBarReady) | **NOT EMITTED** |
-| `NPPN_BEFORESHUTDOWN` | Compare.cpp (onBeforeShutdown) | **NOT EMITTED** |
+| `NPPN_TBMODIFICATION` | Compare.cpp (onToolBarReady) | **EMITTED** (app_delegate.mm) |
+| `NPPN_BEFORESHUTDOWN` | Compare.cpp (onBeforeShutdown) | **EMITTED** (app_delegate.mm) |
 
 ## Tier 3: Polish
 
 | Message | Used In | Host Status |
 |---------|---------|-------------|
 | `NPPM_SETSTATUSBAR` | Compare.cpp (setStatus) | **NOT IMPLEMENTED** |
-| `NPPM_ADDSCNMODIFIEDFLAGS` | Compare.cpp (onNppReady) | **NOT IMPLEMENTED** |
+| `NPPM_ADDSCNMODIFIEDFLAGS` | Compare.cpp (onNppReady) | **IMPLEMENTED** (no-op, host forwards all SCN_MODIFIED) |
 | `NPPM_GETLINENUMBERWIDTHMODE` | Compare.cpp (NppState) | **NOT IMPLEMENTED** |
 | `NPPM_SETLINENUMBERWIDTHMODE` | Compare.cpp (3 calls) | **NOT IMPLEMENTED** |
 | `NPPM_GETCURRENTCMDLINE` | Compare.cpp (checkCmdLine) | **NOT IMPLEMENTED** |
+| `NPPM_GETCURRENTNATIVELANGENCODING` | NppHelpers.h | **IMPLEMENTED** (nppm_handler.mm, returns UTF-8) |
 | `NPPN_GLOBALMODIFIED` | Compare.cpp | **NOT EMITTED** |
 | `NPPN_DARKMODECHANGED` | Compare.cpp | **NOT EMITTED** |
 | `NPPN_WORDSTYLESUPDATED` | Compare.cpp | **NOT EMITTED** |
@@ -46,6 +47,10 @@ Generated as part of Phase 0, Issue #100.
 NPPM: GETCURRENTSCINTILLA, GETCURRENTLANGTYPE, SETCURRENTLANGTYPE, GETCURRENTVIEW,
 GETNBOPENFILES, MENUCOMMAND, SETMENUITEMCHECK, GETPLUGINSCONFIGDIR, GETNPPVERSION,
 ALLOCATECMDID, ALLOCATEMARKER, ALLOCATEINDICATOR, GETFULLCURRENTPATH, GETFILENAME,
-GETCURRENTDIRECTORY, GETNAMEPART, GETEXTPART, GETCURRENTWORD, GETCURRENTLINE, GETCURRENTCOLUMN
+GETCURRENTDIRECTORY, GETNAMEPART, GETEXTPART, GETCURRENTWORD, GETCURRENTLINE, GETCURRENTCOLUMN,
+GETCURRENTBUFFERID, GETPOSFROMBUFFERID, GETBUFFERIDFROMPOS, GETFULLPATHFROMBUFFERID,
+DOOPEN, SWITCHTOFILE, SETBUFFERLANGTYPE, GETBUFFERLANGTYPE, GETMENUHANDLE,
+GETCURRENTNATIVELANGENCODING, ADDSCNMODIFIEDFLAGS
 
-NPPN: NPPN_READY, NPPN_SHUTDOWN, NPPN_LANGCHANGED, NPPN_FILEBEFORECLOSE, NPPN_FILESAVED
+NPPN: NPPN_READY, NPPN_SHUTDOWN, NPPN_LANGCHANGED, NPPN_FILEBEFORECLOSE, NPPN_FILESAVED,
+NPPN_FILEOPENED, NPPN_FILECLOSED, NPPN_BUFFERACTIVATED, NPPN_BEFORESHUTDOWN, NPPN_TBMODIFICATION

macos/platform/nppm_handler.mm

@@ -256,7 +256,8 @@ LRESULT handleNppmMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			if (!lParam)
 				return static_cast<LRESULT>(path.size());
 			wchar_t* buf = reinterpret_cast<wchar_t*>(lParam);
-			wcscpy(buf, path.c_str());
+			wcsncpy(buf, path.c_str(), MAX_PATH - 1);
+			buf[MAX_PATH - 1] = L'\0';
 			return static_cast<LRESULT>(path.size());
 		}
 

macos/shim/include/tchar.h

@@ -167,36 +167,8 @@ inline int swprintf_s(wchar_t* buf, size_t count, const wchar_t* fmt, ...) {
 #define _vsnwprintf vswprintf
 #define sscanf_s sscanf
 
-// _snwprintf_s: safe variant of _snwprintf
-inline int _snwprintf_s(wchar_t* buf, size_t sizeOfBuffer, size_t count, const wchar_t* fmt, ...) {
-	(void)count;
-	va_list args;
-	va_start(args, fmt);
-	int r = vswprintf(buf, sizeOfBuffer, fmt, args);
-	va_end(args);
-	return r;
-}
-
-// _itow_s: safe variant of _itow
-inline errno_t _itow_s(int value, wchar_t* buf, size_t sizeInWords, int radix) {
-	if (!buf || sizeInWords == 0) return EINVAL;
-	if (radix == 10)
-		swprintf(buf, sizeInWords, L"%d", value);
-	else if (radix == 16)
-		swprintf(buf, sizeInWords, L"%x", value);
-	else if (radix == 8)
-		swprintf(buf, sizeInWords, L"%o", value);
-	else
-		buf[0] = L'\0';
-	return 0;
-}
-
-// _wfopen_s: safe variant of _wfopen
-inline errno_t _wfopen_s(FILE** pFile, const wchar_t* filename, const wchar_t* mode) {
-	if (!pFile) return EINVAL;
-	*pFile = _wfopen(filename, mode);
-	return (*pFile) ? 0 : errno;
-}
+// _snwprintf_s, _itow_s, _wfopen_s are defined in winbase.h (included via windows.h).
+// Guarded by SHIM_HAS_SAFE_CRT to prevent duplicate definitions.
 
 // memcpy_s / memmove_s
 #include <cstring>

macos/shim/include/winbase.h

@@ -1169,8 +1169,11 @@ DWORD GetPrivateProfileStringW(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpD
 BOOL WritePrivateProfileStringW(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpString, LPCWSTR lpFileName);
 
 // ============================================================
-// MSVC CRT safe string functions (not in tchar.h for non-tchar code)
+// MSVC CRT safe string functions — single canonical definition.
+// tchar.h defers to these via SHIM_HAS_SAFE_CRT guard.
 // ============================================================
+#ifndef SHIM_HAS_SAFE_CRT
+#define SHIM_HAS_SAFE_CRT
 
 #include <cerrno>
 #include <cstdarg>
@@ -1211,3 +1214,5 @@ inline int _snwprintf_s(wchar_t* buf, size_t sizeOfBuffer, size_t count, const w
 	va_end(args);
 	return r;
 }
+
+#endif // SHIM_HAS_SAFE_CRT

macos/shim/include/winuser.h

@@ -1979,6 +1979,8 @@ struct INPUT
 
 inline UINT SendInput(UINT nInputs, INPUT* pInputs, int cbSize)
 {
-	(void)nInputs; (void)pInputs; (void)cbSize;
-	return 0; // Stub — no input simulation on macOS
+	(void)pInputs; (void)cbSize;
+	// No-op on macOS — return nInputs to indicate "success" so callers
+	// don't treat it as failure and disable features.
+	return nInputs;
 }

macos/shim/src/win32_profile.mm

@@ -141,16 +141,16 @@ DWORD GetPrivateProfileStringW(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpD
 			value = lpDefault ? wideToUtf8(lpDefault) : "";
 		}
 
+		if (!lpReturnedString || nSize == 0)
+			return 0;
+
 		NSString* nsValue = [NSString stringWithUTF8String:value.c_str()];
 		NSData* data = [nsValue dataUsingEncoding:NSUTF32LittleEndianStringEncoding];
 		size_t wcharCount = data.length / sizeof(wchar_t);
 		size_t copyLen = (wcharCount < nSize) ? wcharCount : (nSize - 1);
 
-		if (lpReturnedString && nSize > 0)
-		{
-			memcpy(lpReturnedString, data.bytes, copyLen * sizeof(wchar_t));
-			lpReturnedString[copyLen] = L'\0';
-		}
+		memcpy(lpReturnedString, data.bytes, copyLen * sizeof(wchar_t));
+		lpReturnedString[copyLen] = L'\0';
 
 		return static_cast<DWORD>(copyLen);
 	}
@@ -161,11 +161,22 @@ BOOL WritePrivateProfileStringW(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lp
 	@autoreleasepool {
 		std::string path = wideToUtf8(lpFileName);
 		std::string section = wideToUtf8(lpAppName);
-		std::string key = wideToUtf8(lpKeyName);
-		std::string value = lpString ? wideToUtf8(lpString) : "";
 
 		IniMap ini = parseIniFile(path);
-		ini[section][key] = value;
+
+		// Win32 contract: NULL lpString deletes the key (or section if lpKeyName is also NULL)
+		if (!lpString)
+		{
+			if (!lpKeyName)
+				ini.erase(section);
+			else
+				ini[section].erase(wideToUtf8(lpKeyName));
+		}
+		else
+		{
+			std::string key = wideToUtf8(lpKeyName);
+			ini[section][key] = wideToUtf8(lpString);
+		}
 
 		return writeIniFile(path, ini) ? TRUE : FALSE;
 	}