Implement mailslots.
diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c
index 8ebdd22..5242885 100644
--- a/dlls/kernel/file.c
+++ b/dlls/kernel/file.c
@@ -1217,9 +1217,11 @@
if (!strncmpW(filename, bkslashes_with_dotW, 4))
{
static const WCHAR pipeW[] = {'P','I','P','E','\\',0};
+ static const WCHAR mailslotW[] = {'M','A','I','L','S','L','O','T','\\',0};
if ((isalphaW(filename[4]) && filename[5] == ':' && filename[6] == '\0') ||
- !strncmpiW( filename + 4, pipeW, 5 ))
+ !strncmpiW( filename + 4, pipeW, 5 ) ||
+ !strncmpiW( filename + 4, mailslotW, 9 ))
{
dosdev = 0;
}
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 4e4d485..bd4cc72 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -1641,9 +1641,31 @@
LPDWORD lpNextSize, LPDWORD lpMessageCount,
LPDWORD lpReadTimeout )
{
- FIXME("(%p): stub\n",hMailslot);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ BOOL r;
+
+ TRACE("%p %p %p %p %p\n",hMailslot,
+ lpMaxMessageSize,lpNextSize,lpMessageCount,lpReadTimeout);
+
+ SERVER_START_REQ( set_mailslot_info )
+ {
+ req->handle = hMailslot;
+ req->flags = 0;
+ r = !wine_server_call_err( req );
+ if( r )
+ {
+ if( lpMaxMessageSize )
+ *lpMaxMessageSize = reply->max_msgsize;
+ if( lpNextSize )
+ *lpNextSize = reply->next_msgsize;
+ if( lpMessageCount )
+ *lpMessageCount = reply->msg_count;
+ if( lpReadTimeout )
+ *lpReadTimeout = reply->read_timeout;
+ }
+ }
+ SERVER_END_REQ;
+
+ return r;
}
@@ -1662,9 +1684,20 @@
*/
BOOL WINAPI SetMailslotInfo( HANDLE hMailslot, DWORD dwReadTimeout)
{
- FIXME("%p %ld: stub\n", hMailslot, dwReadTimeout);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ BOOL r;
+
+ TRACE("%p %ld\n", hMailslot, dwReadTimeout);
+
+ SERVER_START_REQ( set_mailslot_info )
+ {
+ req->handle = hMailslot;
+ req->flags = MAILSLOT_SET_READ_TIMEOUT;
+ req->read_timeout = dwReadTimeout;
+ r = !wine_server_call_err( req );
+ }
+ SERVER_END_REQ;
+
+ return r;
}
diff --git a/dlls/kernel/tests/mailslot.c b/dlls/kernel/tests/mailslot.c
index 989ec53..735fea8 100644
--- a/dlls/kernel/tests/mailslot.c
+++ b/dlls/kernel/tests/mailslot.c
@@ -67,8 +67,6 @@
ok( GetLastError() == ERROR_PATH_NOT_FOUND,
"error should be ERROR_PATH_NOT_FOUND\n");
- todo_wine
- {
/* valid open, but with wacky parameters ... then check them */
hSlot = CreateMailslot( szmspath, -1, -1, NULL );
ok( hSlot != INVALID_HANDLE_VALUE , "mailslot with valid name failed\n");
@@ -77,22 +75,15 @@
"getmailslotinfo failed\n");
ok( dwMax == ~0UL, "dwMax incorrect\n");
ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect\n");
- }
ok( dwMsgCount == 0, "dwMsgCount incorrect\n");
- todo_wine
- {
ok( dwTimeout == ~0UL, "dwTimeout incorrect\n");
ok( GetMailslotInfo( hSlot, NULL, NULL, NULL, NULL ),
"getmailslotinfo failed\n");
ok( CloseHandle(hSlot), "failed to close mailslot\n");
- }
- todo_wine
- {
/* now open it for real */
hSlot = CreateMailslot( szmspath, 0, 0, NULL );
ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n");
- }
/* try and read/write to it */
count = 0;
@@ -106,8 +97,6 @@
hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
0, NULL, OPEN_EXISTING, 0, NULL);
ok( hWriter == INVALID_HANDLE_VALUE, "bad sharing mode\n");
- todo_wine
- {
ok( GetLastError() == ERROR_SHARING_VIOLATION,
"error should be ERROR_SHARING_VIOLATION\n");
@@ -115,7 +104,6 @@
hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot\n");
- }
/*
* opening a client should make no difference to
@@ -132,11 +120,8 @@
*/
ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL),
"can read client\n");
- todo_wine
- {
ok( WriteFile( hWriter, buffer, sizeof buffer/2, &count, NULL),
"can't write client\n");
- }
ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL),
"can read client\n");
@@ -144,12 +129,9 @@
* seeing as there's something in the slot,
* we should be able to read it once
*/
- todo_wine
- {
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
"slot read\n");
ok( count == (sizeof buffer/2), "short read\n" );
- }
/* but not again */
ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
@@ -174,8 +156,6 @@
hSlot2 = CreateMailslot( szmspath, 0, 0, NULL );
ok( hSlot2 == INVALID_HANDLE_VALUE , "opened two mailslots\n");
- todo_wine
- {
/* close the client again */
ok( CloseHandle( hWriter ), "closing the client\n");
@@ -186,7 +166,6 @@
hWriter = CreateFile(szmspath, GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
ok( hWriter != INVALID_HANDLE_VALUE, "sharing writer\n");
- }
/*
* now try open another as a writer ...
@@ -196,8 +175,6 @@
FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
ok( hWriter2 == INVALID_HANDLE_VALUE, "greedy writer succeeded\n");
- todo_wine
- {
/* now try open another as a writer ... and share with the first */
hWriter2 = CreateFile(szmspath, GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
@@ -208,7 +185,6 @@
ok( GetMailslotInfo( hSlot, &dwMax, &dwNext, &dwMsgCount, &dwTimeout ),
"getmailslotinfo failed\n");
ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect\n");
- }
ok( dwMax == 0, "dwMax incorrect\n");
ok( dwMsgCount == 0, "dwMsgCount incorrect\n");
ok( dwTimeout == 0, "dwTimeout incorrect\n");
@@ -217,8 +193,6 @@
ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n");
/* write two messages */
- todo_wine
- {
buffer[0] = 'a';
ok( WriteFile( hWriter, buffer, 1, &count, NULL), "1st write failed\n");
@@ -226,7 +200,9 @@
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n");
+ todo_wine {
ok( dwNext == 1, "dwNext incorrect\n");
+ }
ok( dwMsgCount == 1, "dwMsgCount incorrect\n");
buffer[0] = 'b';
@@ -237,8 +213,10 @@
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n");
+ todo_wine {
ok( dwNext == 1, "dwNext incorrect\n");
ok( dwMsgCount == 2, "dwMsgCount incorrect\n");
+ }
/* write a 3rd message with zero size */
ok( WriteFile( hWriter2, buffer, 0, &count, NULL), "3rd write failed\n");
@@ -247,8 +225,10 @@
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n");
+ todo_wine {
ok( dwNext == 1, "dwNext incorrect\n");
ok( dwMsgCount == 3, "dwMsgCount incorrect\n");
+ }
buffer[0]=buffer[1]=0;
@@ -265,8 +245,10 @@
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n");
+ todo_wine {
ok( dwNext == 2, "dwNext incorrect\n");
ok( dwMsgCount == 2, "dwMsgCount incorrect\n");
+ }
/* read the second message */
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
@@ -278,13 +260,13 @@
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n");
- }
+ todo_wine {
ok( dwNext == 0, "dwNext incorrect\n");
- todo_wine
- {
ok( dwMsgCount == 1, "dwMsgCount incorrect\n");
+ }
/* read the 3rd (zero length) message */
+ todo_wine {
ok( ReadFile( hSlot, buffer, sizeof buffer, &count, NULL),
"3rd slot read failed\n");
}
@@ -294,13 +276,10 @@
* now there should be no more messages
* check the mailslot info
*/
- todo_wine
- {
dwNext = dwMsgCount = 0;
ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ),
"getmailslotinfo failed\n");
ok( dwNext == MAILSLOT_NO_MESSAGE, "dwNext incorrect\n");
- }
ok( dwMsgCount == 0, "dwMsgCount incorrect\n");
/* check that reads fail */
@@ -308,12 +287,9 @@
"3rd slot read succeeded\n");
/* finally close the mailslot and its client */
- todo_wine
- {
ok( CloseHandle( hWriter2 ), "closing 2nd client\n");
ok( CloseHandle( hWriter ), "closing the client\n");
ok( CloseHandle( hSlot ), "closing the mailslot\n");
- }
return 0;
}
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 30c3cbd..92c1bf6 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -130,6 +130,7 @@
ULONG options, PVOID ea_buffer, ULONG ea_length )
{
static const WCHAR pipeW[] = {'\\','?','?','\\','p','i','p','e','\\'};
+ static const WCHAR mailslotW[] = {'\\','?','?','\\','M','A','I','L','S','L','O','T','\\'};
ANSI_STRING unix_name;
int created = FALSE;
@@ -166,6 +167,25 @@
return io->u.Status;
}
+ /* check for mailslot */
+
+ if (attr->ObjectName->Length > sizeof(mailslotW) &&
+ !memicmpW( attr->ObjectName->Buffer, mailslotW, sizeof(mailslotW)/sizeof(WCHAR) ))
+ {
+ SERVER_START_REQ( open_mailslot )
+ {
+ req->access = access & GENERIC_WRITE;
+ req->sharing = sharing;
+ req->inherit = (attr->Attributes & OBJ_INHERIT) != 0;
+ wine_server_add_data( req, attr->ObjectName->Buffer + 4,
+ attr->ObjectName->Length - 4*sizeof(WCHAR) );
+ io->u.Status = wine_server_call( req );
+ *handle = reply->handle;
+ }
+ SERVER_END_REQ;
+ return io->u.Status;
+ }
+
io->u.Status = wine_nt_to_unix_file_name( attr->ObjectName, &unix_name, disposition,
!(attr->Attributes & OBJ_CASE_INSENSITIVE) );
@@ -1766,7 +1786,7 @@
'\\','?','?','\\','M','A','I','L','S','L','O','T','\\'};
NTSTATUS ret;
- FIXME("%p %08lx %p %p %08lx %08lx %08lx %p\n",
+ TRACE("%p %08lx %p %p %08lx %08lx %08lx %p\n",
pHandle, DesiredAccess, attr, IoStatusBlock,
CreateOptions, MailslotQuota, MaxMessageSize, TimeOut);
@@ -1777,7 +1797,18 @@
return STATUS_OBJECT_NAME_INVALID;
}
- ret = STATUS_NOT_IMPLEMENTED;
-
+ SERVER_START_REQ( create_mailslot )
+ {
+ req->max_msgsize = MaxMessageSize;
+ req->read_timeout = TimeOut->QuadPart / -10000;
+ req->inherit = (attr->Attributes & OBJ_INHERIT) != 0;
+ wine_server_add_data( req, attr->ObjectName->Buffer + 4,
+ attr->ObjectName->Length - 4*sizeof(WCHAR) );
+ ret = wine_server_call( req );
+ if( ret == STATUS_SUCCESS )
+ *pHandle = reply->handle;
+ }
+ SERVER_END_REQ;
+
return ret;
}
