Index: dll/win32/msafd/misc/sndrcv.c
===================================================================
--- dll/win32/msafd/misc/sndrcv.c	(revision 73228)
+++ dll/win32/msafd/misc/sndrcv.c	(working copy)
@@ -193,6 +193,12 @@
             *lpErrno = WSAEFAULT;
         return SOCKET_ERROR;
     }
+    if (Socket->SharedData->OobInline && ReceiveFlags && (*ReceiveFlags & MSG_OOB) != 0)
+    {
+        if (lpErrno)
+            *lpErrno = WSAEINVAL;
+        return SOCKET_ERROR;
+    }
 
     Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS,
                             NULL, 1, FALSE );
@@ -381,6 +387,12 @@
             *lpErrno = WSAEFAULT;
         return SOCKET_ERROR;
     }
+    if (Socket->SharedData->OobInline && ReceiveFlags && (*ReceiveFlags & MSG_OOB) != 0)
+    {
+        if (lpErrno)
+            *lpErrno = WSAEINVAL;
+        return SOCKET_ERROR;
+    }
 
     if (!(Socket->SharedData->ServiceFlags1 & XP1_CONNECTIONLESS))
     {