fixed SynCrtSock.SysErrorMessagePerModule on non-English systems

- as reported by #411
synopse · Oct 28, 2021 · f5cb6f9 · f5cb6f9
1 parent 8494081
commit f5cb6f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/SynCrtSock.pas b/SynCrtSock.pas
@@ -3922,6 +3922,11 @@ function SysErrorMessagePerModule(Code: DWORD; ModuleName: PChar): string;
   tmpLen := FormatMessage(
     FORMAT_MESSAGE_FROM_HMODULE or FORMAT_MESSAGE_ALLOCATE_BUFFER,
     pointer(GetModuleHandle(ModuleName)),Code,ENGLISH_LANGID,@err,0,nil);
+  // if string is empty, it may be because english is not found
+  if (tmpLen = 0) then
+     tmpLen := FormatMessage(
+       FORMAT_MESSAGE_FROM_HMODULE or FORMAT_MESSAGE_ALLOCATE_BUFFER or FORMAT_MESSAGE_IGNORE_INSERTS,
+       pointer(GetModuleHandle(ModuleName)),Code,0,@err,0,nil);
   try
     while (tmpLen>0) and (ord(err[tmpLen-1]) in [0..32,ord('.')]) do
       dec(tmpLen);

diff --git a/SynopseCommit.inc b/SynopseCommit.inc
@@ -1 +1 @@
-'1.18.6337'
+'1.18.6338'