X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=1655d40af701731b0cdc1fdc0e3308e2795d899e;hb=407cd1126c6c24d890359f1fe1686f6d90c0ad61;hp=b10b0daf9db095568012e5c5493e9bb5377c0f35;hpb=3a11677c0e70fe1833016cbf9070c3d5df615112;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index b10b0da..1655d40 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,7 @@
  * Massachusetts. 
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -73,6 +73,7 @@
 #include <richedit.h>
 #include <mmsystem.h>
 #include <ctype.h>
+#include <io.h>
 
 #if __GNUC__
 #include <errno.h>
@@ -123,9 +124,10 @@ typedef struct {
   POINT pos;      /* window coordinates of current pos */
   POINT lastpos;  /* window coordinates of last pos - used for clipping */
   POINT from;     /* board coordinates of the piece's orig pos */
+  ChessSquare piece;
 } DragInfo;
 
-static DragInfo dragInfo = { {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1} };
+static DragInfo dragInfo = { {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, EmptySquare };
 
 typedef struct {
   POINT sq[2];	  /* board coordinates of from, to squares */
@@ -345,6 +347,7 @@ LoadLanguageFile(char *name)
 
     if(!name || name[0] == NULLCHAR) return;
       snprintf(buf, MSG_SIZ, "%s%s", name, strchr(name, '.') ? "" : ".lng"); // auto-append lng extension
+    appData.language = oldLanguage;
     if(!strcmp(buf, oldLanguage)) { barbaric = 1; return; } // this language already loaded; just switch on
     if((f = fopen(buf, "r")) == NULL) return;
     while((k = fgetc(f)) != EOF) {
@@ -398,13 +401,11 @@ Translate(HWND hDlg, int dialogID)
 {   // translate all text items in the given dialog
     int i=0, j, k;
     char buf[MSG_SIZ], *s;
-//if(appData.debugMode) fprintf(debugFP, "Translate(%d)\n", dialogID);
     if(!barbaric) return;
     while(dialogItems[i][0] && dialogItems[i][0] != dialogID) i++; // find the dialog description
     if(dialogItems[i][0] != dialogID) return; // unknown dialog, should not happen
     GetWindowText( hDlg, buf, MSG_SIZ );
     s = T_(buf);
-//if(appData.debugMode) fprintf(debugFP, "WindowText '%s' -> '%s'\n", buf, s);
     if(strcmp(buf, s)) SetWindowText(hDlg, s); // replace by translated string (if different)
     for(j=1; k=dialogItems[i][j]; j++) { // translate all listed dialog items
         GetDlgItemText(hDlg, k, buf, MSG_SIZ);
@@ -414,33 +415,45 @@ Translate(HWND hDlg, int dialogID)
     }
 }
 
+HMENU
+TranslateOneMenu(int i, HMENU subMenu)
+{
+    int j;
+    static MENUITEMINFO info;
+
+    info.cbSize = sizeof(MENUITEMINFO);
+    info.fMask = MIIM_STATE | MIIM_TYPE;
+          for(j=GetMenuItemCount(subMenu)-1; j>=0; j--){
+            char buf[MSG_SIZ];
+            info.dwTypeData = buf;
+            info.cch = sizeof(buf);
+            GetMenuItemInfo(subMenu, j, TRUE, &info);
+            if(i < 10) {
+                if(menuText[i][j]) safeStrCpy(buf, menuText[i][j], sizeof(buf)/sizeof(buf[0]) );
+                else menuText[i][j] = strdup(buf); // remember original on first change
+            }
+            if(buf[0] == NULLCHAR) continue;
+            info.dwTypeData = T_(buf);
+            info.cch = strlen(buf)+1;
+            SetMenuItemInfo(subMenu, j, TRUE, &info);
+          }
+    return subMenu;
+}
+
 void
 TranslateMenus(int addLanguage)
 {
-    int i, j;
+    int i;
     WIN32_FIND_DATA fileData;
     HANDLE hFind;
-#define IDM_English 1895
+#define IDM_English 1970
     if(1) {
         HMENU mainMenu = GetMenu(hwndMain);
         for (i=GetMenuItemCount(mainMenu)-1; i>=0; i--) {
           HMENU subMenu = GetSubMenu(mainMenu, i);
           ModifyMenu(mainMenu, i, MF_STRING|MF_BYPOSITION|MF_POPUP|EnableMenuItem(mainMenu, i, MF_BYPOSITION),
                                                                   (UINT) subMenu, T_(menuBarText[tinyLayout][i]));
-          for(j=GetMenuItemCount(subMenu)-1; j>=0; j--){
-            char buf[MSG_SIZ];
-            UINT k = GetMenuItemID(subMenu, j);
-	      if(menuText[i][j])
-		safeStrCpy(buf, menuText[i][j], sizeof(buf)/sizeof(buf[0]) ); else {
-                GetMenuString(subMenu, j, buf, MSG_SIZ, MF_BYPOSITION);
-                menuText[i][j] = strdup(buf); // remember original on first change
-            }
-            if(buf[0] == NULLCHAR) continue;
-//fprintf(debugFP, "menu(%d,%d) = %s (%08x, %08x) %d\n", i, j, buf, mainMenu, subMenu, k);
-            ModifyMenu(subMenu, j, MF_STRING|MF_BYPOSITION
-                                   |CheckMenuItem(subMenu, j, MF_BYPOSITION)
-                                   |EnableMenuItem(subMenu, j, MF_BYPOSITION), k, T_(buf));
-          }
+          TranslateOneMenu(i, subMenu);
         }
         DrawMenuBar(hwndMain);
     }
@@ -641,7 +654,6 @@ LRESULT CALLBACK
   StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 VOID APIENTRY MenuPopup(HWND hwnd, POINT pt, HMENU hmenu, UINT def);
 void ParseIcsTextMenu(char *icsTextMenuString);
-VOID PopUpMoveDialog(char firstchar);
 VOID PopUpNameDialog(char firstchar);
 VOID UpdateSampleText(HWND hDlg, int id, MyColorizeAttribs *mca);
 
@@ -756,6 +768,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   }
 
   JAWS_INIT
+  TranslateMenus(1);
 
 //  InitCommonControlsEx(&ex);
   InitCommonControls();
@@ -942,6 +955,24 @@ EnsureOnScreen(int *x, int *y, int minX, int minY)
   if (*y < minY) *y = minY;
 }
 
+VOID
+LoadLogo(ChessProgramState *cps, int n)
+{
+  if( appData.logo[n] && appData.logo[n][0] != NULLCHAR) {
+      cps->programLogo = LoadImage( 0, appData.logo[n], IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+
+      if (cps->programLogo == NULL && appData.debugMode) {
+          fprintf( debugFP, "Unable to load logo bitmap '%s'\n", appData.logo[n] );
+      }
+  } else if(appData.autoLogo) {
+      if(appData.firstDirectory && appData.directory[n][0]) {
+	char buf[MSG_SIZ];
+	  snprintf(buf, MSG_SIZ, "%s/logo.bmp", appData.directory[n]);
+	cps->programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
+      }
+  }
+}
+
 BOOL
 InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 {
@@ -997,19 +1028,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   /* [HGM] logo: Load logos if specified (must be done before InitDrawingSizes) */
-  if( appData.firstLogo && appData.firstLogo[0] != NULLCHAR) {
-      first.programLogo = LoadImage( 0, appData.firstLogo, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
-
-      if (first.programLogo == NULL && appData.debugMode) {
-          fprintf( debugFP, "Unable to load logo bitmap '%s'\n", appData.firstLogo );
-      }
-  } else if(appData.autoLogo) {
-      if(appData.firstDirectory && appData.firstDirectory[0]) {
-	char buf[MSG_SIZ];
-	  snprintf(buf, MSG_SIZ, "%s/logo.bmp", appData.firstDirectory);
-	first.programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
-      }
-  }
+  LoadLogo(&first, 0);
 
   if( appData.secondLogo && appData.secondLogo[0] != NULLCHAR) {
       second.programLogo = LoadImage( 0, appData.secondLogo, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
@@ -1050,7 +1069,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   InitDrawingSizes(boardSize, 0);
-  TranslateMenus(1);
   InitMenuChecks();
   buttonCount = GetSystemMetrics(SM_CMOUSEBUTTONS);
 
@@ -2213,7 +2231,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   }
 
   if (tinyLayout != oldTinyLayout) {
-    long style = GetWindowLong(hwndMain, GWL_STYLE);
+    long style = GetWindowLongPtr(hwndMain, GWL_STYLE);
     if (tinyLayout) {
       style &= ~WS_SYSMENU;
       InsertMenu(hmenu, IDM_Exit, MF_BYCOMMAND, IDM_Minimize,
@@ -2222,7 +2240,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
       style |= WS_SYSMENU;
       RemoveMenu(hmenu, IDM_Minimize, MF_BYCOMMAND);
     }
-    SetWindowLong(hwndMain, GWL_STYLE, style);
+    SetWindowLongPtr(hwndMain, GWL_STYLE, style);
 
     for (i=0; menuBarText[tinyLayout][i]; i++) {
       ModifyMenu(hmenu, i, MF_STRING|MF_BYPOSITION|MF_POPUP, 
@@ -2371,7 +2389,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 		     boardRect.right - BUTTON_WIDTH*(N_BUTTONS-i),
 		     messageRect.top, BUTTON_WIDTH, messageSize.cy, hwndMain,
 		     (HMENU) buttonDesc[i].id,
-		     (HINSTANCE) GetWindowLong(hwndMain, GWL_HINSTANCE), NULL);
+		     (HINSTANCE) GetWindowLongPtr(hwndMain, GWLP_HINSTANCE), NULL);
       if (tinyLayout) {
 	SendMessage(buttonDesc[i].hwnd, WM_SETFONT, 
 		    (WPARAM)font[boardSize][MESSAGE_FONT]->hf,
@@ -2380,7 +2398,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
       if (buttonDesc[i].id == IDM_Pause)
 	hwndPause = buttonDesc[i].hwnd;
       buttonDesc[i].wndproc = (WNDPROC)
-	SetWindowLong(buttonDesc[i].hwnd, GWL_WNDPROC, (LONG) ButtonProc);
+	SetWindowLongPtr(buttonDesc[i].hwnd, GWLP_WNDPROC, (LONG_PTR) ButtonProc);
     }
   }
   if (gridPen != NULL) DeleteObject(gridPen);
@@ -3384,6 +3402,48 @@ DrawLogoOnDC(HDC hdc, RECT logoRect, HBITMAP logo)
   DeleteDC(tmphdc);
 }
 
+VOID
+DisplayLogos()
+{
+  if(logoHeight) {
+	HDC hdc = GetDC(hwndMain);
+	HBITMAP whiteLogo = (HBITMAP) first.programLogo, blackLogo = (HBITMAP) second.programLogo;
+	if(appData.autoLogo) {
+	  
+	  switch(gameMode) { // pick logos based on game mode
+	    case IcsObserving:
+		whiteLogo = second.programLogo; // ICS logo
+		blackLogo = second.programLogo;
+	    default:
+		break;
+	    case IcsPlayingWhite:
+		if(!appData.zippyPlay) whiteLogo = userLogo;
+		blackLogo = second.programLogo; // ICS logo
+		break;
+	    case IcsPlayingBlack:
+		whiteLogo = second.programLogo; // ICS logo
+		blackLogo = appData.zippyPlay ? first.programLogo : userLogo;
+		break;
+	    case TwoMachinesPlay:
+	        if(first.twoMachinesColor[0] == 'b') {
+		    whiteLogo = second.programLogo;
+		    blackLogo = first.programLogo;
+		}
+		break;
+	    case MachinePlaysWhite:
+		blackLogo = userLogo;
+		break;
+	    case MachinePlaysBlack:
+		whiteLogo = userLogo;
+		blackLogo = first.programLogo;
+	  }
+	}
+	DrawLogoOnDC(hdc, leftLogoRect, flipClock ? blackLogo : whiteLogo);
+	DrawLogoOnDC(hdc, rightLogoRect, flipClock ? whiteLogo : blackLogo);
+	ReleaseDC(hwndMain, hdc);
+  }
+}
+
 static HDC hdcSeek;
 
 // [HGM] seekgraph
@@ -3722,41 +3782,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	}
     }
   }
-  if(logoHeight) {
-	HBITMAP whiteLogo = (HBITMAP) first.programLogo, blackLogo = (HBITMAP) second.programLogo;
-	if(appData.autoLogo) {
-	  
-	  switch(gameMode) { // pick logos based on game mode
-	    case IcsObserving:
-		whiteLogo = second.programLogo; // ICS logo
-		blackLogo = second.programLogo;
-	    default:
-		break;
-	    case IcsPlayingWhite:
-		if(!appData.zippyPlay) whiteLogo = userLogo;
-		blackLogo = second.programLogo; // ICS logo
-		break;
-	    case IcsPlayingBlack:
-		whiteLogo = second.programLogo; // ICS logo
-		blackLogo = appData.zippyPlay ? first.programLogo : userLogo;
-		break;
-	    case TwoMachinesPlay:
-	        if(first.twoMachinesColor[0] == 'b') {
-		    whiteLogo = second.programLogo;
-		    blackLogo = first.programLogo;
-		}
-		break;
-	    case MachinePlaysWhite:
-		blackLogo = userLogo;
-		break;
-	    case MachinePlaysBlack:
-		whiteLogo = userLogo;
-		blackLogo = first.programLogo;
-	  }
-	}
-	DrawLogoOnDC(hdc, leftLogoRect, flipClock ? blackLogo : whiteLogo);
-	DrawLogoOnDC(hdc, rightLogoRect, flipClock ? whiteLogo : blackLogo);
-  }
 
   if( appData.highlightMoveWithArrow ) {
     DrawArrowHighlight(hdcmem);
@@ -3778,8 +3803,8 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
     board[dragInfo.from.y][dragInfo.from.x] = dragged_piece;
     x = dragInfo.pos.x - squareSize / 2;
     y = dragInfo.pos.y - squareSize / 2;
-    DrawPieceOnDC(hdcmem, dragged_piece,
-		  ((int) dragged_piece < (int) BlackPawn), 
+    DrawPieceOnDC(hdcmem, dragInfo.piece,
+		  ((int) dragInfo.piece < (int) BlackPawn), 
                   (dragInfo.from.y + dragInfo.from.x) % 2, x, y, tmphdc);
   }   
   
@@ -3824,11 +3849,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;
@@ -3892,6 +3917,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);
      }
   }
 
@@ -3928,11 +3954,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;
 }
@@ -3971,6 +3994,7 @@ PaintProc(HWND hwnd)
 		 &messageRect, messageText, strlen(messageText), NULL);
       SelectObject(hdc, oldFont);
       DisplayBothClocks();
+      DisplayLogos();
     }
     EndPaint(hwnd,&ps);
   }
@@ -4044,6 +4068,7 @@ void DragPieceBegin(int x, int y)
       dragInfo.lastpos.y = boardRect.top + y;
       dragInfo.from.x = fromX;
       dragInfo.from.y = fromY;
+      dragInfo.piece = boards[currentMove][fromY][fromX];
       dragInfo.start = dragInfo.from;
       SetCapture(hwndMain);
 }
@@ -4056,6 +4081,11 @@ void DragPieceEnd(int x, int y)
     dragInfo.pos = dragInfo.lastpos = dragInfo.start;
 }
 
+void ChangeDragPiece(ChessSquare piece)
+{
+    dragInfo.piece = piece;
+}
+
 /* Event handler for mouse messages */
 VOID
 MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -4094,23 +4124,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   switch (message) {
   case WM_LBUTTONDOWN:
       if (PtInRect((LPRECT) &whiteRect, pt)) {
-        if (gameMode == EditPosition) {
-	  SetWhiteToPlayEvent();
-        } else if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) {
-          AdjustClock(flipClock, -1);
-	} else if (gameMode == IcsPlayingBlack ||
-		   gameMode == MachinePlaysWhite) {
-	  CallFlagEvent();
-        }
+        ClockClick(flipClock);
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-	if (gameMode == EditPosition) {
-	  SetBlackToPlayEvent();
-        } else if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) {
-          AdjustClock(!flipClock, -1);
-	} else if (gameMode == IcsPlayingWhite ||
-		   gameMode == MachinePlaysBlack) {
-	  CallFlagEvent();
-	}
+	ClockClick(!flipClock);
       }
       dragInfo.start.x = dragInfo.start.y = -1;
       dragInfo.from = dragInfo.start;
@@ -4130,6 +4146,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
   case WM_MOUSEMOVE:
     if(SeekGraphClick(Press, pt.x - boardRect.left, pt.y - boardRect.top, 1)) break;
+    if(PromoScroll(pt.x - boardRect.left, pt.y - boardRect.top)) break;
     MovePV(pt.x - boardRect.left, pt.y - boardRect.top, boardRect.bottom - boardRect.top);
     if ((appData.animateDragging || appData.highlightDragging)
 	&& (wParam & MK_LBUTTON)
@@ -4236,7 +4253,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 LRESULT CALLBACK
 ButtonProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  int id = GetWindowLong(hwnd, GWL_ID);
+  int id = GetWindowLongPtr(hwnd, GWLP_ID);
   int i, dir;
 
   for (i=0; i<N_BUTTONS; i++) {
@@ -4267,7 +4284,7 @@ ButtonProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	SendMessage(h, WM_CHAR, wParam, lParam);
 	return TRUE;
       } else if (isalpha((char)wParam) || isdigit((char)wParam)){
-	PopUpMoveDialog((char)wParam);
+	TypeInEvent((char)wParam);
       }
       break;
     }
@@ -4289,19 +4306,20 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     Translate(hDlg, DLG_PromotionKing);
     ShowWindow(GetDlgItem(hDlg, PB_King), 
       (!appData.testLegality || gameInfo.variant == VariantSuicide ||
+       gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove) ||
        gameInfo.variant == VariantGiveaway || gameInfo.variant == VariantSuper ) ?
 	       SW_SHOW : SW_HIDE);
     /* [HGM] Only allow C & A promotions if these pieces are defined */
     ShowWindow(GetDlgItem(hDlg, PB_Archbishop),
-       ((PieceToChar(WhiteAngel) >= 'A' &&
+       ((PieceToChar(WhiteAngel) >= 'A' && WhiteOnMove(currentMove) &&
          PieceToChar(WhiteAngel) != '~') ||
-        (PieceToChar(BlackAngel) >= 'A' &&
+        (PieceToChar(BlackAngel) >= 'A' && !WhiteOnMove(currentMove) &&
          PieceToChar(BlackAngel) != '~')   ) ?
 	       SW_SHOW : SW_HIDE);
     ShowWindow(GetDlgItem(hDlg, PB_Chancellor), 
-       ((PieceToChar(WhiteMarshall) >= 'A' &&
+       ((PieceToChar(WhiteMarshall) >= 'A' && WhiteOnMove(currentMove) &&
          PieceToChar(WhiteMarshall) != '~') ||
-        (PieceToChar(BlackMarshall) >= 'A' &&
+        (PieceToChar(BlackMarshall) >= 'A' && !WhiteOnMove(currentMove) &&
          PieceToChar(BlackMarshall) != '~')   ) ?
 	       SW_SHOW : SW_HIDE);
     /* [HGM] Hide B & R button in Shogi, use Q as promote, N as defer */
@@ -4332,31 +4350,30 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = gameInfo.variant == VariantSuper ? PieceToChar(BlackSilver) : PieceToChar(BlackKing);
       break;
     case PB_Queen:
-      promoChar = gameInfo.variant == VariantShogi ? '+' : PieceToChar(BlackQueen);
+      promoChar = gameInfo.variant == VariantShogi ? '+' : ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteQueen : BlackQueen));
       break;
     case PB_Rook:
-      promoChar = PieceToChar(BlackRook);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteRook : BlackRook));
+      if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) promoChar = PieceToChar(BlackDragon);
       break;
     case PB_Bishop:
-      promoChar = PieceToChar(BlackBishop);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteBishop : BlackBishop));
+      if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) promoChar = PieceToChar(BlackAlfil);
       break;
     case PB_Chancellor:
-      promoChar = PieceToChar(BlackMarshall);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteMarshall : BlackMarshall));
       break;
     case PB_Archbishop:
-      promoChar = PieceToChar(BlackAngel);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteAngel : BlackAngel));
       break;
     case PB_Knight:
-      promoChar = gameInfo.variant == VariantShogi ? '=' : PieceToChar(BlackKnight);
+      promoChar = gameInfo.variant == VariantShogi ? '=' : PieceToChar(WhiteOnMove(currentMove) ? WhiteKnight : BlackKnight);
       break;
     default:
       return FALSE;
     }
+    if(promoChar == '.') return FALSE; // invalid piece chosen 
     EndDialog(hDlg, TRUE); /* Exit the dialog */
-    /* [HGM] <popupFix> Call FinishMove rather than UserMoveEvent, as we
-       only show the popup when we are already sure the move is valid or
-       legal. We pass a faulty move type, but the kludge is that FinishMove
-       will figure out it is a promotion from the promoChar. */
     UserMoveEvent(fromX, fromY, toX, toY, promoChar);
     fromX = fromY = -1;
     if (!appData.highlightLastMove) {
@@ -4466,11 +4483,11 @@ void UpdateICSWidth(HWND hText)
     LONG old_width, new_width;
 
     new_width = get_term_width(hText, FALSE);
-    old_width = GetWindowLong(hText, GWL_USERDATA);
+    old_width = GetWindowLongPtr(hText, GWLP_USERDATA);
     if (new_width != old_width)
     {
         ics_update_width(new_width);
-        SetWindowLong(hText, GWL_USERDATA, new_width);
+        SetWindowLongPtr(hText, GWLP_USERDATA, new_width);
     }
 }
 
@@ -4576,7 +4593,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	SendMessage(h, message, wParam, lParam);
     } else if(lParam != KF_REPEAT) {
 	if (isalpha((char)wParam) || isdigit((char)wParam)) {
-		PopUpMoveDialog((char)wParam);
+		TypeInEvent((char)wParam);
 	} else if((char)wParam == 003) CopyGameToClipboard();
 	 else if((char)wParam == 026) PasteGameOrFENFromClipboard();
     }
@@ -4701,7 +4718,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       f = OpenFileDialog(hwnd, "wb", defName,
 			 "bmp",
 			 DIAGRAM_FILT,
-			 "Save Diagram to File", NULL, fileTitle, NULL);
+			 _("Save Diagram to File"), NULL, fileTitle, NULL);
       if (f != NULL) {
 	SaveDiagram(f);
       }
@@ -4831,12 +4848,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
-      if(gameMode != BeginningOfGame) { // allow menu item to remain enabled for better mode highligting
-        DisplayError(_("You can only start a match from the initial position."), 0); break;
-      }
-      matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
-      appData.matchGames = appData.defaultMatchGames;
-      matchGame = 1;
+      MatchEvent(2); // distinguish from command-line-triggered case (matchMode=1)
+      break;
 
     case IDM_TwoMachines:
       TwoMachinesEvent();
@@ -4930,7 +4943,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditProgs2:
-      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
+     LoadEnginePopUp(hwndMain);
+//      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
       break;
 
     case IDM_EditServers:
@@ -4942,6 +4956,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       EditTagsProc();
       break;
 
+    case IDM_EditBook:
+      EditBookEvent();
+      break;
+
     case IDM_EditComment:
     case IDM_Comment:
       if (commentUp && editComment) {
@@ -5000,7 +5018,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_TypeInMove:
-      PopUpMoveDialog('\000');
+      TypeInEvent('\000');
       break;
 
     case IDM_TypeInName:
@@ -5057,7 +5075,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case IDM_FlipClock:
       flipClock = !flipClock;
       DisplayBothClocks();
-      DrawPosition(FALSE, NULL);
+      DisplayLogos();
       break;
 
     case IDM_MuteSounds:
@@ -5085,7 +5103,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;
 
@@ -5093,6 +5111,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       UciOptionsPopup(hwnd);
       break;
 
+    case IDM_Tourney:
+      TourneyPopup(hwnd);
+      break;
+
     case IDM_IcsOptions:
       IcsOptionsPopup(hwnd);
       break;
@@ -5378,7 +5400,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_English:
-      barbaric = 0;
+      barbaric = 0; appData.language = "";
       TranslateMenus(0);
       CheckMenuItem(GetMenu(hwndMain), lastChecked, MF_BYCOMMAND|MF_UNCHECKED);
       CheckMenuItem(GetMenu(hwndMain), IDM_English, MF_BYCOMMAND|MF_CHECKED);
@@ -5386,7 +5408,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     default:
-      if(wmId > IDM_English && wmId < IDM_English+5) {
+      if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
           TranslateMenus(0);
           CheckMenuItem(GetMenu(hwndMain), lastChecked, MF_BYCOMMAND|MF_UNCHECKED);
@@ -5806,6 +5828,7 @@ MenuPopup(HWND hwnd, POINT pt, HMENU hmenu, UINT def)
    * menu that TrackPopupMenu displays.
    */
   hmenuTrackPopup = GetSubMenu(hmenu, 0);
+  TranslateOneMenu(10, hmenuTrackPopup);
 
   SetMenuDefaultItem(hmenuTrackPopup, def, FALSE);
 
@@ -6057,8 +6080,8 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	          appData.firstChessProgram, "fd", appData.firstDirectory,
 		  firstChessProgramNames);
     InitEngineBox(hDlg, GetDlgItem(hDlg, OPT_SecondChessEngineName),
-	          appData.secondChessProgram, "sd", appData.secondDirectory,
-		  secondChessProgramNames);
+	          appData.secondChessProgram, singleList ? "fd" : "sd", appData.secondDirectory,
+		  singleList ? firstChessProgramNames : secondChessProgramNames); //[HGM] single: use first list in second combo
     hwndCombo = GetDlgItem(hDlg, OPT_ChessServerName);
     InitComboStringsFromOption(hwndCombo, icsNames);    
       snprintf(buf, MSG_SIZ, "%s /icsport=%s", appData.icsHost, appData.icsPort);
@@ -6095,10 +6118,12 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	GetDlgItemText(hDlg, OPT_ChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
         p = buf;
 	ParseArgs(StringGet, &p);
-	safeStrCpy(buf, "/scp=", sizeof(buf)/sizeof(buf[0]) );
+	safeStrCpy(buf, singleList ? "/fcp=" : "/scp=", sizeof(buf)/sizeof(buf[0]) );
 	GetDlgItemText(hDlg, OPT_SecondChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
-        p = buf;
+        p = buf;
+	SwapEngines(singleList); // temporarily swap first and second, to load a second 'first', ...
 	ParseArgs(StringGet, &p);
+	SwapEngines(singleList); // ... and then make it 'second'
 	appData.noChessProgram = FALSE;
 	appData.icsActive = FALSE;
       } else if (IsDlgButtonChecked(hDlg, OPT_ChessServer)) {
@@ -6244,7 +6269,7 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	sizeY = newSizeY;
       }
     }
-    SendDlgItemMessage( hDlg, OPT_CommentText, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS );
+    SendDlgItemMessage( hDlg, OPT_CommentText, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_KEYEVENTS );
     return FALSE;
 
   case WM_COMMAND: /* message: received a command */
@@ -6293,13 +6318,19 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
         if( wParam == OPT_CommentText ) {
             MSGFILTER * lpMF = (MSGFILTER *) lParam;
 
-            if( lpMF->msg == WM_RBUTTONDOWN && (lpMF->wParam & (MK_CONTROL | MK_SHIFT)) == 0 ) {
+            if( lpMF->msg == WM_RBUTTONDOWN && (lpMF->wParam & (MK_CONTROL | MK_SHIFT)) == 0 ||
+                lpMF->msg == WM_CHAR && lpMF->wParam == '\022' ) {
                 POINTL pt;
                 LRESULT index;
 
                 pt.x = LOWORD( lpMF->lParam );
                 pt.y = HIWORD( lpMF->lParam );
 
+                if(lpMF->msg == WM_CHAR) {
+                        CHARRANGE sel;
+                        SendDlgItemMessage( hDlg, OPT_CommentText, EM_EXGETSEL, 0, (LPARAM) &sel );
+                        index = sel.cpMin;
+                } else
                 index = SendDlgItemMessage( hDlg, OPT_CommentText, EM_CHARFROMPOS, 0, (LPARAM) &pt );
 
 		hwndText = GetDlgItem(hDlg, OPT_CommentText); // cloned from above
@@ -6384,9 +6415,6 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   char move[MSG_SIZ];
   HWND hInput;
-  ChessMove moveType;
-  int fromX, fromY, toX, toY;
-  char promoChar;
 
   switch (message) {
   case WM_INITDIALOG:
@@ -6403,39 +6431,10 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
     case IDOK:
+
       shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
-      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
-      { int n; Board board;
-	// [HGM] FENedit
-	if(gameMode == EditPosition && ParseFEN(board, &n, move) ) {
-		EditPositionPasteFEN(move);
-		EndDialog(hDlg, TRUE);
-		return TRUE;
-	}
-	// [HGM] movenum: allow move number to be typed in any mode
-	if(sscanf(move, "%d", &n) == 1 && n != 0 ) {
-	  ToNrEvent(2*n-1);
-	  EndDialog(hDlg, TRUE);
-	  return TRUE;
-	}
-      }
-      if (gameMode != EditGame && currentMove != forwardMostMove && 
-	gameMode != Training) {
-	DisplayMoveError(_("Displayed move is not current"));
-      } else {
-//	GetDlgItemText(hDlg, OPT_Move, move, sizeof(move)); // moved upstream
-	int ok = ParseOneMove(move, gameMode == EditPosition ? blackPlaysFirst : currentMove, 
-	  &moveType, &fromX, &fromY, &toX, &toY, &promoChar);
-	if(!ok && move[0] >= 'a') { move[0] += 'A' - 'a'; ok = 2; } // [HGM] try also capitalized
-	if (ok==1 || ok && ParseOneMove(move, gameMode == EditPosition ? blackPlaysFirst : currentMove, 
-	  &moveType, &fromX, &fromY, &toX, &toY, &promoChar)) {
-	  if (gameMode != Training)
-	      forwardMostMove = currentMove;
-	  UserMoveEvent(fromX, fromY, toX, toY, promoChar);	
-	} else {
-	  DisplayMoveError(_("Could not parse move"));
-	}
-      }
+      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
+      TypeInDoneEvent(move);
       EndDialog(hDlg, TRUE);
       return TRUE;
     case IDCANCEL:
@@ -6453,21 +6452,11 @@ VOID
 PopUpMoveDialog(char firstchar)
 {
     FARPROC lpProc;
-    
-    if ((gameMode == BeginningOfGame && !appData.icsActive) || 
-        gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack ||
-	gameMode == AnalyzeMode || gameMode == EditGame || 
-	gameMode == EditPosition || gameMode == IcsExamining ||
-	gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack ||
-	isdigit(firstchar) && // [HGM] movenum: allow typing in of move nr in 'passive' modes
-		( gameMode == AnalyzeFile || gameMode == PlayFromGameFile ||
-		  gameMode == IcsObserving || gameMode == TwoMachinesPlay    ) ||
-	gameMode == Training) {
+
       lpProc = MakeProcInstance((FARPROC)TypeInMoveDialog, hInst);
       DialogBoxParam(hInst, MAKEINTRESOURCE(DLG_TypeInMove),
 	hwndMain, (DLGPROC)lpProc, (LPARAM)firstchar);
       FreeProcInstance(lpProc);
-    }
 }
 
 /*---------------------------------------------------------------------------*\
@@ -6857,6 +6846,7 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   switch (message) {
   case WM_KEYDOWN:
     if (!(GetKeyState(VK_CONTROL) & ~1)) break;
+    if(wParam=='R') return 0;
     switch (wParam) {
     case VK_PRIOR:
       SendMessage(hwnd, EM_LINESCROLL, 0, -999999);
@@ -6890,7 +6880,8 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       SendMessage(hInput, message, wParam, lParam);
     }
     return 0;
-   } // [HGM] navigate: for Ctrl+R, flow into nex case (moved up here) to summon up menu
+   } // [HGM] navigate: for Ctrl+R, flow into next case (moved up here) to summon up menu
+   lParam = -1;
   case WM_RBUTTONDOWN:
     if (!(GetKeyState(VK_SHIFT) & ~1)) {
       /* Move selection here if it was empty */
@@ -6899,7 +6890,7 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       pt.y = HIWORD(lParam);
       SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);
       if (sel.cpMin == sel.cpMax) {
-        sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
+        if(lParam != -1) sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
 	sel.cpMax = sel.cpMin;
 	SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);
       }
@@ -7176,10 +7167,10 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     hwndConsole = hDlg;
     SetFocus(hInput);
     consoleTextWindowProc = (WNDPROC)
-      SetWindowLong(hText, GWL_WNDPROC, (LONG) ConsoleTextSubclass);
+      SetWindowLongPtr(hText, GWLP_WNDPROC, (LONG_PTR) ConsoleTextSubclass);
     SendMessage(hText, EM_SETBKGNDCOLOR, FALSE, consoleBackgroundColor);
     consoleInputWindowProc = (WNDPROC)
-      SetWindowLong(hInput, GWL_WNDPROC, (LONG) ConsoleInputSubclass);
+      SetWindowLongPtr(hInput, GWLP_WNDPROC, (LONG_PTR) ConsoleInputSubclass);
     SendMessage(hInput, EM_SETBKGNDCOLOR, FALSE, consoleBackgroundColor);
     Colorize(ColorNormal, TRUE);
     SendMessage(hInput, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) &consoleCF);
@@ -7225,7 +7216,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
    wMask = (WORD) SendMessage(hText, EM_GETEVENTMASK, 0, 0L);
    SendMessage(hText, EM_SETEVENTMASK, 0, wMask | ENM_LINK);
    SendMessage(hText, EM_AUTOURLDETECT, TRUE, 0L);
-   SetWindowLong(hText, GWL_USERDATA, 79); // initialize the text window's width
+   SetWindowLongPtr(hText, GWLP_USERDATA, 79); // initialize the text window's width
 
     return FALSE;
 
@@ -7768,6 +7759,22 @@ Enables gnuEnables[] = {
   { IDM_Revert, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
+
+  // Needed to switch from ncp to GNU mode on Engine Load
+  { ACTION_POS, MF_BYPOSITION|MF_ENABLED },
+  { IDM_MachineWhite, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_MachineBlack, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_TwoMachines, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Match, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_AnalysisMode, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_AnalyzeFile, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine2Options, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_TimeControl, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_RetractMove, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_MoveNow, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Hint, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Book, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
 };
 
@@ -7785,10 +7792,12 @@ Enables icsEnables[] = {
   { IDM_MoveNow, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_EditProgs2, MF_BYCOMMAND|MF_GRAYED },
   { IDM_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Tourney, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -7824,6 +7833,7 @@ Enables ncpEnables[] = {
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Sounds, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -7879,7 +7889,7 @@ Enables machineThinkingEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
-  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
+//  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TypeInMove, MF_BYCOMMAND|MF_GRAYED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
@@ -7899,7 +7909,7 @@ Enables userThinkingEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_ENABLED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_ENABLED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_ENABLED },
-  { IDM_Match, MF_BYCOMMAND|MF_ENABLED },
+//  { IDM_Match, MF_BYCOMMAND|MF_ENABLED },
   { IDM_TypeInMove, MF_BYCOMMAND|MF_ENABLED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
@@ -7912,6 +7922,12 @@ Enables userThinkingEnables[] = {
  * 
 \*---------------------------------------------------------------------------*/
 VOID
+CheckMark(UINT item, int state)
+{
+    if(item) CheckMenuItem(GetMenu(hwndMain), item, MF_BYCOMMAND|state);
+}
+
+VOID
 ModeHighlight()
 {
   static UINT prevChecked = 0;
@@ -7941,7 +7957,7 @@ ModeHighlight()
     nowChecked = IDM_MachineWhite;
     break;
   case TwoMachinesPlay:
-    nowChecked = matchMode ? IDM_Match : IDM_TwoMachines; // [HGM] match
+    nowChecked = IDM_TwoMachines;
     break;
   case AnalyzeMode:
     nowChecked = IDM_AnalysisMode;
@@ -7972,12 +7988,9 @@ ModeHighlight()
     nowChecked = 0;
     break;
   }
-  if (prevChecked != 0)
-    (void) CheckMenuItem(GetMenu(hwndMain),
-			 prevChecked, MF_BYCOMMAND|MF_UNCHECKED);
-  if (nowChecked != 0)
-    (void) CheckMenuItem(GetMenu(hwndMain),
-			 nowChecked, MF_BYCOMMAND|MF_CHECKED);
+  CheckMark(prevChecked, MF_UNCHECKED);
+  CheckMark(nowChecked, MF_CHECKED);
+  CheckMark(IDM_Match, matchMode && matchGame < appData.matchGames ? MF_CHECKED : MF_UNCHECKED);
 
   if (nowChecked == IDM_LoadGame || nowChecked == IDM_Training) {
     (void) EnableMenuItem(GetMenu(hwndMain), IDM_Training, 
@@ -7992,13 +8005,12 @@ ModeHighlight()
   /* [DM] icsEngineAnalyze - Do a sceure check too */
   if (appData.icsActive) {
        if (appData.icsEngineAnalyze) {
-               (void) CheckMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
-                       MF_BYCOMMAND|MF_CHECKED);
+               CheckMark(IDM_AnalysisMode, MF_CHECKED);
        } else {
-               (void) CheckMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
-                       MF_BYCOMMAND|MF_UNCHECKED);
+               CheckMark(IDM_AnalysisMode, MF_UNCHECKED);
        }
   }
+  DisplayLogos(); // [HGM] logos: mode change could have altered logos
 }
 
 VOID
@@ -8006,8 +8018,8 @@ SetICSMode()
 {
   HMENU hmenu = GetMenu(hwndMain);
   SetMenuEnables(hmenu, icsEnables);
-  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), ICS_POS,
-    MF_BYPOSITION|MF_ENABLED);
+  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), IDM_IcsOptions,
+    MF_BYCOMMAND|MF_ENABLED);
 #if ZIPPY
   if (appData.zippyPlay) {
     SetMenuEnables(hmenu, zippyEnables);
@@ -8029,8 +8041,6 @@ SetNCPMode()
 {
   HMENU hmenu = GetMenu(hwndMain);
   SetMenuEnables(hmenu, ncpEnables);
-  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), SOUNDS_POS,
-    MF_BYPOSITION|MF_GRAYED);
     DrawMenuBar(hwndMain);
 }
 
@@ -8136,7 +8146,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;
 
@@ -8901,6 +8912,9 @@ StartChildProcess(char *cmdLine, char *dir, ProcRef *pr)
    * dir relative to the directory WinBoard loaded from. */
   GetCurrentDirectory(MSG_SIZ, buf);
   SetCurrentDirectory(installDir);
+  // kludgey way to update logos in tourney, as long as back-end can't do it
+  if(!strcmp(cmdLine, first.program)) LoadLogo(&first, 0); else
+  if(!strcmp(cmdLine, second.program)) LoadLogo(&second, 1);
   SetCurrentDirectory(dir);
 
   /* Now create the child process. */
@@ -9806,3 +9820,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;
+}