wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Jacek Caban : ntdll: Use correct size when checking iosb in NtFlushBuffersFile (Coverity).
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 3d5a2567977455d04e4896368a71db74e7b9074b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5a2567977455d04e489636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 13:43:38 2018 +0100 ntdll: Use correct size when checking iosb in NtFlushBuffersFile (Coverity). Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 870ad06..622b5de 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3305,7 +3305,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) enum server_fd_type type; int fd, needs_close; - if (!io || !virtual_check_buffer_for_write( io, sizeof(io) )) return STATUS_ACCESS_VIOLATION; + if (!io || !virtual_check_buffer_for_write( io, sizeof(*io) )) return STATUS_ACCESS_VIOLATION; ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); if (ret == STATUS_ACCESS_DENIED)

1 0

Jacek Caban : ntdll: Correctly return result of blocking NtFlushBuffersFile.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 9050b58f0769fca75c4cebed7be3cce51989814e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9050b58f0769fca75c4cebed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:48 2018 +0100 ntdll: Correctly return result of blocking NtFlushBuffersFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- dlls/ntdll/file.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7f77df1..05e23bf 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2852,7 +2852,7 @@ static DWORD CALLBACK flush_proc(HANDLE pipe) if (expected_flush_error == ERROR_SUCCESS) ok(res, "FlushFileBuffers failed: %u\n", GetLastError()); else - todo_wine ok(!res && GetLastError() == expected_flush_error, "FlushFileBuffers failed: %u\n", GetLastError()); + ok(!res && GetLastError() == expected_flush_error, "FlushFileBuffers failed: %u\n", GetLastError()); return 0; } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d3b3698..870ad06 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3317,9 +3317,17 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) } else if (ret != STATUS_ACCESS_DENIED) { + struct async_irp *async; + + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, hFile ))) + return STATUS_NO_MEMORY; + async->event = NULL; + async->buffer = NULL; + async->size = 0; + SERVER_START_REQ( flush ) { - req->async = server_async( hFile, NULL, NULL, NULL, NULL, io ); + req->async = server_async( hFile, &async->io, NULL, NULL, NULL, io ); ret = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->event ); if (wait_handle && ret != STATUS_PENDING) @@ -3330,6 +3338,8 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) } SERVER_END_REQ; + if (ret != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (wait_handle) { NtWaitForSingleObject( wait_handle, FALSE, NULL );

1 0

Jacek Caban : kernel32: Wait on pipe handle in TransactNamedPipe if needed.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 4fc5aff50981687a7cb7c3599a47da7cbb44d4e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc5aff50981687a7cb7c359… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:27 2018 +0100 kernel32: Wait on pipe handle in TransactNamedPipe if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index f3bd962..6d47d70 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1746,6 +1746,11 @@ BOOL WINAPI TransactNamedPipe( status = NtFsControlFile(handle, event, NULL, cvalue, iosb, FSCTL_PIPE_TRANSCEIVE, write_buf, write_size, read_buf, read_size); + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject(handle, INFINITE); + status = iosb->u.Status; + } if (bytes_read) *bytes_read = overlapped && status ? 0 : iosb->Information;

1 0

Jacek Caban : kernel32: Wait on pipe handle in ConnectNamedPipe if needed.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: b114bd07b1edb29b47251edf0b7ce136d455a8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b114bd07b1edb29b47251edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:22 2018 +0100 kernel32: Wait on pipe handle in ConnectNamedPipe if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fe70565..f3bd962 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1681,6 +1681,11 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped) status = NtFsControlFile(hPipe, overlapped ? overlapped->hEvent : NULL, NULL, cvalue, overlapped ? (IO_STATUS_BLOCK *)overlapped : &status_block, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject(hPipe, INFINITE); + status = status_block.u.Status; + } if (status == STATUS_SUCCESS) return TRUE; SetLastError( RtlNtStatusToDosError(status) );

1 0

Louis Lenders : iphlpapi: Add stub for GetIpInterfaceTable.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 5a675ea44aa1f0ac06f55e52528fe8d8cb45499c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a675ea44aa1f0ac06f55e52… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Oct 28 18:58:03 2018 +0100 iphlpapi: Add stub for GetIpInterfaceTable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46015 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ include/netioapi.h | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 30d9ed7..b4f77be 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -105,7 +105,7 @@ @ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry -#@ stub GetIpInterfaceTable +@ stdcall GetIpInterfaceTable( long ptr ) #@ stub GetIpNetEntry2 @ stdcall GetIpNetTable( ptr ptr long ) @ stdcall GetIpNetTable2( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6273949..5df4cd8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3304,3 +3304,12 @@ DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY family, PMIB_IPNET_TABLE2 *table) if (!once++) FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetIpInterfaceTable (IPHLPAPI.@) + */ +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE *table) +{ + FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index e9de7dd..a41bae0 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -140,6 +140,12 @@ typedef struct _MIB_IPINTERFACE_ROW BOOLEAN DisableDefaultRoutes; } MIB_IPINTERFACE_ROW, *PMIB_IPINTERFACE_ROW; +typedef struct _MIB_IPINTERFACE_TABLE +{ + ULONG NumEntries; + MIB_IPINTERFACE_ROW Table[ANY_SIZE]; +} MIB_IPINTERFACE_TABLE, *PMIB_IPINTERFACE_TABLE; + typedef struct _MIB_UNICASTIPADDRESS_ROW { SOCKADDR_INET Address; @@ -242,6 +248,7 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); NET_IFINDEX WINAPI if_nametoindex(PCSTR);

1 0

Louis Lenders : advapi32: Add stub for RegQueryReflectionKey.
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 924fd31cadacab61a9d258c2abd9ad2df6729c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=924fd31cadacab61a9d258c2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Oct 28 22:39:38 2018 +0100 advapi32: Add stub for RegQueryReflectionKey. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45796 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 9 +++++++++ include/winreg.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 8ebc580..e870a5d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -668,7 +668,7 @@ @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) @ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) -# @ stub RegQueryReflectionKey +@ stdcall RegQueryReflectionKey(long ptr) @ stdcall RegQueryValueA(long str ptr ptr) @ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a83341f..9989097 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1194,6 +1194,15 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW return RtlNtStatusToDosError( status ); } +/****************************************************************************** + * RegQueryReflectionKey [ADVAPI32.@] + */ +LONG WINAPI RegQueryReflectionKey( HKEY hkey, BOOL *is_reflection_disabled ) +{ + FIXME( "%p, %p stub\n", hkey, is_reflection_disabled ); + *is_reflection_disabled = TRUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} /****************************************************************************** * RegCloseKey [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index ddbd929..51e9f02 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,7 @@ WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,L WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) +WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); WINADVAPI LSTATUS WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue)

1 0

Zebediah Figura : rpcrt4: Ignore fMustAlloc in PointerUnmarshall().
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 03be1605db1d436e125df14a702c9228ddf12622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03be1605db1d436e125df14a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 28 17:25:49 2018 -0500 rpcrt4: Ignore fMustAlloc in PointerUnmarshall(). Use our own heuristics to decide whether we, or the inner routine, must allocate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 57 ++++++++++++++++++++++------------------ dlls/rpcrt4/tests/ndr_marshall.c | 41 +++-------------------------- 2 files changed, 35 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03be1605db1d436e125d…

1 0

Zebediah Figura : rpcrt4: Clarify local variables in PointerUnmarshall().
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: 61fdcfdd368cf2781c5fdbb0e9870efc188abee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61fdcfdd368cf2781c5fdbb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 28 17:25:48 2018 -0500 rpcrt4: Clarify local variables in PointerUnmarshall(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2364301..aeac0cf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -950,26 +950,25 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, * whether we have to initialise it so we can use the optimisation of * setting the pointer to the buffer, if possible, or set fMustAlloc to * TRUE. */ - if (attr & FC_POINTER_DEREF) { + if (attr & FC_POINTER_DEREF) + { if (pSrcPointer && (attr & FC_ALLOCED_ON_STACK)) *pPointer = pSrcPointer; else fMustAlloc = TRUE; - } else { - *current_ptr = NULL; } + else + *pPointer = NULL; } if (attr & FC_ALLOCATE_ALL_NODES) FIXME("FC_ALLOCATE_ALL_NODES not implemented\n"); if (attr & FC_POINTER_DEREF) { - if (fMustAlloc) { - unsigned char *base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); - *pPointer = base_ptr_val; - current_ptr = (unsigned char **)base_ptr_val; - } else - current_ptr = *(unsigned char***)current_ptr; + if (fMustAlloc) + *pPointer = NdrAllocateZero(pStubMsg, sizeof(void *)); + + current_ptr = *(unsigned char***)current_ptr; TRACE("deref => %p\n", current_ptr); if (!fMustAlloc && !*current_ptr) fMustAlloc = TRUE; }

1 0

Zebediah Figura : rpcrt4: Clear allocated memory before marshalling pointers into it (Valgrind).
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: be430b2626afcf917d80e14011fccf80b4fde277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be430b2626afcf917d80e140… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 28 17:25:47 2018 -0500 rpcrt4: Clear allocated memory before marshalling pointers into it (Valgrind). Since otherwise PointerUnmarshall() might try to interpret pointers contained therein as existing storage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d1edf2c..2364301 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -436,6 +436,13 @@ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, SIZE_T len) return p; } +static void *NdrAllocateZero(MIDL_STUB_MESSAGE *stubmsg, SIZE_T len) +{ + void *mem = NdrAllocate(stubmsg, len); + memset(mem, 0, len); + return mem; +} + static void NdrFree(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *Pointer) { TRACE("(%p, %p)\n", pStubMsg, Pointer); @@ -1752,7 +1759,7 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, align_pointer(&pStubMsg->Buffer, pFormat[1] + 1); if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, size); + *ppMemory = NdrAllocateZero(pStubMsg, size); else { if (!pStubMsg->IsClient && !*ppMemory) @@ -2143,7 +2150,7 @@ static inline ULONG array_read_variance_and_unmarshall( if (fUnmarshall) { if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, memsize); + *ppMemory = NdrAllocateZero(pStubMsg, memsize); else { if (fUseBufferMemoryServer && !pStubMsg->IsClient && !*ppMemory) @@ -2182,7 +2189,7 @@ static inline ULONG array_read_variance_and_unmarshall( if (!fMustAlloc && !*ppMemory) fMustAlloc = TRUE; if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, memsize); + *ppMemory = NdrAllocateZero(pStubMsg, memsize); saved_buffer = pStubMsg->Buffer; safe_buffer_increment(pStubMsg, bufsize); @@ -2259,7 +2266,7 @@ static inline ULONG array_read_variance_and_unmarshall( if (!fMustAlloc && !*ppMemory) fMustAlloc = TRUE; if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, memsize); + *ppMemory = NdrAllocateZero(pStubMsg, memsize); align_pointer(&pStubMsg->Buffer, alignment); saved_buffer = pStubMsg->Buffer; @@ -3716,7 +3723,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (!fMustAlloc && !*ppMemory) fMustAlloc = TRUE; if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, size); + *ppMemory = NdrAllocateZero(pStubMsg, size); pMemory = ComplexUnmarshall(pStubMsg, *ppMemory, pFormat, pointer_desc, fMustAlloc); @@ -4774,7 +4781,7 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs if (fMustAlloc) { SIZE_T size = pCStructFormat->memory_size + bufsize; - *ppMemory = NdrAllocate(pStubMsg, size); + *ppMemory = NdrAllocateZero(pStubMsg, size); } else { @@ -4975,7 +4982,7 @@ unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE if (fMustAlloc) { SIZE_T size = pCVStructFormat->memory_size + memsize; - *ppMemory = NdrAllocate(pStubMsg, size); + *ppMemory = NdrAllocateZero(pStubMsg, size); } /* mark the start of the constant data */ @@ -5216,7 +5223,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, total_size); + *ppMemory = NdrAllocateZero(pStubMsg, total_size); else { if (!pStubMsg->IsClient && !*ppMemory) @@ -5462,7 +5469,7 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (!fMustAlloc && !*ppMemory) fMustAlloc = TRUE; if (fMustAlloc) - *ppMemory = NdrAllocate(pStubMsg, size); + *ppMemory = NdrAllocateZero(pStubMsg, size); saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; safe_buffer_increment(pStubMsg, bufsize);

1 0

Zebediah Figura : rpcrt4: Add comments explaining the arguments to EmbeddedPointerUnmarshall().
by Alexandre Julliard 30 Oct '18

30 Oct '18

Module: wine Branch: master Commit: c3db8982d4072cd2eb0f8c33d9d8741bc7feee4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3db8982d4072cd2eb0f8c33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 28 17:25:46 2018 -0500 rpcrt4: Add comments explaining the arguments to EmbeddedPointerUnmarshall(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b48b300..d1edf2c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -856,9 +856,9 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, STD_OVERFLOW_CHECK(pStubMsg); } -/*********************************************************************** - * PointerUnmarshall [internal] - */ +/* pPointer is the pointer that we will unmarshal into; pSrcPointer is the + * pointer to memory which we may attempt to reuse if non-NULL. Usually these + * are the same; for the case when they aren't, see EmbeddedPointerUnmarshall(). */ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, unsigned char **pPointer, @@ -1228,9 +1228,14 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } -/*********************************************************************** - * EmbeddedPointerUnmarshall - */ +/* rpcrt4 does something bizarre with embedded pointers: instead of copying the + * struct/array/union from the buffer to memory and then unmarshalling pointers + * into it, it unmarshals pointers into the buffer itself and then copies it to + * memory. However, it will still attempt to use a user-supplied pointer where + * appropriate (i.e. one on stack). Therefore we need to pass both pointers to + * this function and to PointerUnmarshall: the pointer (to the buffer) that we + * will actually unmarshal into (pDstBuffer), and the pointer (to memory) that + * we will attempt to use for storage if possible (pSrcMemoryPtrs). */ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pDstBuffer, unsigned char *pSrcMemoryPtrs,

1 0

← Newer
1
2
3
4
5
6
7
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018