X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=c8bf0b209ed1f2b4212b10717487f4d67e30d24f;hb=ecd851c92b21c55ac41a91870deabeff6409fb96;hp=07e4bd20de7e04c3641a3cffe5a0be6e8bb6246d;hpb=d39b0224115daf24fa2608e27d0ca16c8cd4aa70;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 07e4bd2..c8bf0b2 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -73,6 +73,7 @@
 #include <richedit.h>
 #include <mmsystem.h>
 #include <ctype.h>
+#include <io.h>
 
 #if __GNUC__
 #include <errno.h>
@@ -3842,11 +3843,11 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	 boardRect.bottom - boardRect.top,
 	 tmphdc, boardRect.left, boardRect.top, SRCCOPY);
   if(saveDiagFlag) { 
-    BITMAP b; int i, j=0, m, w, wb, fac=0; char pData[1000000]; 
+    BITMAP b; int i, j=0, m, w, wb, fac=0; char *pData; 
     BITMAPINFOHEADER bih; int color[16], nrColors=0;
 
     GetObject(bufferBitmap, sizeof(b), &b);
-    if(b.bmWidthBytes*b.bmHeight <= 990000) {
+    if(pData = malloc(b.bmWidthBytes*b.bmHeight + 10000)) {
 	bih.biSize = sizeof(BITMAPINFOHEADER);
 	bih.biWidth = b.bmWidth;
 	bih.biHeight = b.bmHeight;
@@ -3910,6 +3911,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	// write bitmap data
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN); i++) 
 		fputc(pData[i], diagFile);
+	free(pData);
      }
   }
 
@@ -3946,11 +3948,8 @@ SaveDiagram(f)
 {
     saveDiagFlag = 1; diagFile = f;
     HDCDrawPosition(NULL, TRUE, NULL);
-
     saveDiagFlag = 0;
 
-//    if(f != NULL) fprintf(f, "Sorry, but this feature is still in preparation\n");
-    
     fclose(f);
     return TRUE;
 }
@@ -5097,7 +5096,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case IDM_Engine2Options:
       savedHwnd = hwnd;
-      if(WaitForSecond(SettingsMenuIfReady)) break;
+      if(WaitForEngine(&second, SettingsMenuIfReady)) break;
       EngineOptionsPopup(hwnd, &second);
       break;
 
@@ -8115,7 +8114,8 @@ DisplayMessage(char *str1, char *str2)
     if (len > remain) len = remain;
     strncat(messageText, str2, len);
   }
-  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
+  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
+  safeStrCpy(lastMsg, messageText, MSG_SIZ);
 
   if (hwndMain == NULL || IsIconic(hwndMain)) return;
 
@@ -9785,3 +9785,19 @@ SettingsPopUp(ChessProgramState *cps)
 {     // [HGM] wrapper needed because handles must not be passed through back-end
       EngineOptionsPopup(savedHwnd, cps);
 }
+
+int flock(int fid, int code)
+{
+    HANDLE hFile = (HANDLE) _get_osfhandle(fid);
+    OVERLAPPED ov;
+    ov.hEvent = NULL;
+    ov.Offset = 0;
+    ov.OffsetHigh = 0;
+    switch(code) {
+      case 1: LockFileEx(hFile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1024, 0, &ov); break;   // LOCK_SH
+      case 2: LockFileEx(hFile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1024, 0, &ov); break;   // LOCK_EX
+      case 3: UnlockFileEx(hFile, 0, 1024, 0, &ov); break; // LOCK_UN
+      default: return -1;
+    }
+    return 0;
+}