marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the same path transformation for WaitNamedPipe and 

CreateNamedPipe.
oldstable
Robert Shearman 2004-06-14 17:00:21 +00:00 committed by Alexandre Julliard
parent 1e2dcc457e
commit 6c91e9bff6
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/kernel/sync.c
View File

@ -1193,18 +1193,28 @@ BOOL WINAPI WaitNamedPipeA (LPCSTR name, DWORD nTimeOut)
*/ */
BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut)
{ {
DWORD len = name ? strlenW(name) : 0;
BOOL ret; BOOL ret;
OVERLAPPED ov; OVERLAPPED ov;
UNICODE_STRING nt_name;
if (len >= MAX_PATH) static const WCHAR leadin[] = {'\\','?','?','\\','P','I','P','E','\\'};
{
SetLastError( ERROR_FILENAME_EXCED_RANGE );
return FALSE;
}
TRACE("%s 0x%08lx\n",debugstr_w(name),nTimeOut); TRACE("%s 0x%08lx\n",debugstr_w(name),nTimeOut);
if (!RtlDosPathNameToNtPathName_U( name, &nt_name, NULL, NULL ))
return FALSE;
if (nt_name.Length >= MAX_PATH * sizeof(WCHAR) )
{
RtlFreeUnicodeString( &nt_name );
return FALSE;
}
if (nt_name.Length < sizeof(leadin) ||
strncmpiW( nt_name.Buffer, leadin, sizeof(leadin)/sizeof(leadin[0])))
{
RtlFreeUnicodeString( &nt_name );
return FALSE;
}
memset(&ov,0,sizeof(ov)); memset(&ov,0,sizeof(ov));
ov.hEvent = CreateEventW( NULL, 0, 0, NULL ); ov.hEvent = CreateEventW( NULL, 0, 0, NULL );
if (!ov.hEvent) if (!ov.hEvent)
@ -1215,11 +1225,13 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut)
req->timeout = nTimeOut; req->timeout = nTimeOut;
req->overlapped = &ov; req->overlapped = &ov;
req->func = SYNC_CompletePipeOverlapped; req->func = SYNC_CompletePipeOverlapped;
wine_server_add_data( req, name, len * sizeof(WCHAR) ); wine_server_add_data( req, nt_name.Buffer + 4, nt_name.Length - 4*sizeof(WCHAR) );
ret = !wine_server_call_err( req ); ret = !wine_server_call_err( req );
} }
SERVER_END_REQ; SERVER_END_REQ;
RtlFreeUnicodeString( &nt_name );
if(ret) if(ret)
{ {
if (WAIT_OBJECT_0==WaitForSingleObject(ov.hEvent,INFINITE)) if (WAIT_OBJECT_0==WaitForSingleObject(ov.hEvent,INFINITE))
@ -1651,7 +1663,7 @@ __ASM_GLOBAL_FUNC(InterlockedCompareExchange,
"movl 8(%esp),%ecx\n\t" "movl 8(%esp),%ecx\n\t"
"movl 4(%esp),%edx\n\t" "movl 4(%esp),%edx\n\t"
"lock; cmpxchgl %ecx,(%edx)\n\t" "lock; cmpxchgl %ecx,(%edx)\n\t"
"ret $12"); "ret $12")
/*********************************************************************** /***********************************************************************
* InterlockedExchange (KERNEL32.@) * InterlockedExchange (KERNEL32.@)
@ -1661,7 +1673,7 @@ __ASM_GLOBAL_FUNC(InterlockedExchange,
"movl 8(%esp),%eax\n\t" "movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t" "movl 4(%esp),%edx\n\t"
"lock; xchgl %eax,(%edx)\n\t" "lock; xchgl %eax,(%edx)\n\t"
"ret $8"); "ret $8")
/*********************************************************************** /***********************************************************************
* InterlockedExchangeAdd (KERNEL32.@) * InterlockedExchangeAdd (KERNEL32.@)
@ -1671,7 +1683,7 @@ __ASM_GLOBAL_FUNC(InterlockedExchangeAdd,
"movl 8(%esp),%eax\n\t" "movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t" "movl 4(%esp),%edx\n\t"
"lock; xaddl %eax,(%edx)\n\t" "lock; xaddl %eax,(%edx)\n\t"
"ret $8"); "ret $8")
/*********************************************************************** /***********************************************************************
* InterlockedIncrement (KERNEL32.@) * InterlockedIncrement (KERNEL32.@)
@ -1682,7 +1694,7 @@ __ASM_GLOBAL_FUNC(InterlockedIncrement,
"movl $1,%eax\n\t" "movl $1,%eax\n\t"
"lock; xaddl %eax,(%edx)\n\t" "lock; xaddl %eax,(%edx)\n\t"
"incl %eax\n\t" "incl %eax\n\t"
"ret $4"); "ret $4")
/*********************************************************************** /***********************************************************************
* InterlockedDecrement (KERNEL32.@) * InterlockedDecrement (KERNEL32.@)
@ -1692,7 +1704,7 @@ __ASM_GLOBAL_FUNC(InterlockedDecrement,
"movl $-1,%eax\n\t" "movl $-1,%eax\n\t"
"lock; xaddl %eax,(%edx)\n\t" "lock; xaddl %eax,(%edx)\n\t"
"decl %eax\n\t" "decl %eax\n\t"
"ret $4"); "ret $4")
#else /* __i386__ */ #else /* __i386__ */