--- graphics/x11drv/graphics.c
+++ graphics/x11drv/graphics.c
@@ -212,8 +212,11 @@ BOOL X11DRV_SetupGCForPen( X11DRV_PDEVIC
 	/* It is very unlikely someone wants to XOR with 0 */
 	/* This fixes the rubber-drawings in paintbrush */
 	if (val.foreground == 0)
+        {
+            FIXME("Attempt to XOR with 0, working around\n");
             val.foreground = (WhitePixel( gdi_display, DefaultScreen(gdi_display) ) ^
                               BlackPixel( gdi_display, DefaultScreen(gdi_display) ));
+        }
 	val.function = GXxor;
 	break;
     default :
--- windows/painting.c
+++ windows/painting.c
@@ -1158,7 +1158,7 @@ BOOL WINAPI DrawFocusRect( HDC hdc, cons
     INT oldDrawMode, oldBkMode;
 
     hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH));
-    hNewPen = CreatePen(PS_ALTERNATE, 1, GetSysColor(COLOR_WINDOWTEXT));
+    hNewPen = CreatePen(PS_ALTERNATE, 1, RGB(255, 255, 255));
     hOldPen = SelectObject(hdc, hNewPen);
     oldDrawMode = SetROP2(hdc, R2_XORPEN);
     oldBkMode = SetBkMode(hdc, TRANSPARENT);