October 2018 - Wine-commits

Jacek Caban : rpcrt4: Add RpcExceptionFilter implementation.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 8a48621fc9b56d0ca68e89dd3d6720cd2c4d8db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a48621fc9b56d0ca68e89dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:57:37 2018 +0200 rpcrt4: Add RpcExceptionFilter implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 3 ++- dlls/rpcrt4/rpcrt4_main.c | 3 ++- dlls/rpcrt4/tests/rpc.c | 23 ++++++++++++----------- include/rpcdce.h | 2 ++ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index aa30ee7..0dc6789 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -42,7 +42,7 @@ @ stub I_RpcConnectionSetSockBuffSize @ stub I_RpcDeleteMutex @ stub I_RpcEnableWmiTrace # wxp -@ stdcall I_RpcExceptionFilter(long) +@ stdcall I_RpcExceptionFilter(long) RpcExceptionFilter @ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer @@ -383,6 +383,7 @@ @ stub RpcErrorResetEnumeration # wxp @ stdcall RpcErrorSaveErrorInfo(ptr ptr ptr) @ stdcall RpcErrorStartEnumeration(ptr) +@ stdcall RpcExceptionFilter(long) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index d5d349d..b274139 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -854,9 +854,10 @@ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) } /****************************************************************************** + * RpcExceptionFilter (rpcrt4.@) * I_RpcExceptionFilter (rpcrt4.@) */ -int WINAPI I_RpcExceptionFilter(ULONG ExceptionCode) +int WINAPI RpcExceptionFilter(ULONG ExceptionCode) { TRACE("0x%x\n", ExceptionCode); switch (ExceptionCode) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index c9f2a4b..d3a3aee 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -649,15 +649,15 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_I_RpcExceptionFilter(void) +static void test_RpcExceptionFilter(const char *func_name) { ULONG exception; int retval; - int (WINAPI *pI_RpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "I_RpcExceptionFilter"); + int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - if (!pI_RpcExceptionFilter) + if (!pRpcExceptionFilter) { - win_skip("I_RpcExceptionFilter not exported\n"); + win_skip("%s not exported\n", func_name); return; } @@ -668,7 +668,7 @@ static void test_I_RpcExceptionFilter(void) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pI_RpcExceptionFilter(exception); + retval = pRpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +679,17 @@ static void test_I_RpcExceptionFilter(void) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", - exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", + func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("I_RpcExceptionFilter(0x%x) returned %d\n", exception, retval); + trace("%s(0x%x) returned %d\n", func_name, exception, retval); break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", - exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", + func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1198,7 +1198,8 @@ START_TEST( rpc ) test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); - test_I_RpcExceptionFilter(); + test_RpcExceptionFilter("I_RpcExceptionFilter"); + test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); test_UuidCreate(); test_UuidCreateSequential(); diff --git a/include/rpcdce.h b/include/rpcdce.h index ee01d88..fc1fcea 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -325,6 +325,8 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); +RPCRTAPI int RPC_ENTRY RpcExceptionFilter(ULONG); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding );

1 0

Jacek Caban : rpcrt4/tests: Add a test of client reconnecting on send failure.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: cae3d28a9bd9221ff8acf1aaa5eb41c27744d9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae3d28a9bd9221ff8acf1aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:58:07 2018 +0200 rpcrt4/tests: Add a test of client reconnecting on send failure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 163 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1494904..587dc45 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1973,6 +1973,118 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcStringFree\n"); } +HANDLE create_server_process(void) +{ + SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; + HANDLE ready_event; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + DWORD ret; + + memset(&startup, 0, sizeof startup); + startup.cb = sizeof startup; + + ready_event = CreateEventW(&sec_attr, TRUE, FALSE, NULL); + ok(ready_event != NULL, "CreateEvent failed: %u\n", GetLastError()); + + sprintf(cmdline, "%s server run %lx", progname, (UINT_PTR)ready_event); + trace("running server process...\n"); + ok(CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + ret = WaitForSingleObject(ready_event, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + + ok(CloseHandle(info.hThread), "CloseHandle\n"); + ok(CloseHandle(ready_event), "CloseHandle\n"); + return info.hProcess; +} + +static void run_server(HANDLE ready_event) +{ + static unsigned char np[] = "ncacn_np"; + static unsigned char pipe[] = PIPE "term_test"; + RPC_STATUS status; + BOOL ret; + + status = RpcServerUseProtseqEpA(np, 0, pipe, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %d\n", status); + + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); + + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); + + stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + ret = SetEvent(ready_event); + ok(ret, "SetEvent failed: %u\n", GetLastError()); + + ret = WaitForSingleObject(stop_event, 1000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); + + CloseHandle(stop_event); + stop_event = NULL; +} + +static DWORD WINAPI basic_tests_thread(void *arg) +{ + basic_tests(); + return 0; +} + +static void test_reconnect(void) +{ + static unsigned char np[] = "ncacn_np"; + static unsigned char address_np[] = "\\\\."; + static unsigned char pipe[] = PIPE "term_test"; + unsigned char *binding; + HANDLE threads[32]; + HANDLE server_process; + unsigned i; + DWORD ret; + + server_process = create_server_process(); + + ok(RPC_S_OK == RpcStringBindingComposeA(NULL, np, address_np, pipe, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + + for (i = 0; i < ARRAY_SIZE(threads); i++) + { + threads[i] = CreateThread(NULL, 0, basic_tests_thread, 0, 0, NULL); + ok(threads[i] != NULL, "CreateThread failed: %u\n", GetLastError()); + } + + for (i = 0; i < ARRAY_SIZE(threads); i++) + { + ret = WaitForSingleObject(threads[i], 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + CloseHandle(threads[i]); + } + + stop(); + + winetest_wait_child_process(server_process); + ok(CloseHandle(server_process), "CloseHandle\n"); + + /* create new server, rpcrt4 will connect to it once sending to existing connection fails + * that current connection is broken. */ + server_process = create_server_process(); + basic_tests(); + stop(); + + winetest_wait_child_process(server_process); + ok(CloseHandle(server_process), "CloseHandle\n"); + + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); +} + static BOOL is_process_elevated(void) { HANDLE token; @@ -2099,16 +2211,10 @@ START_TEST(server) ULONG size = 0; int argc; char **argv; - BOOL firewall_enabled = is_firewall_enabled(); + BOOL firewall_enabled = is_firewall_enabled(), firewall_disabled = FALSE; InitFunctionPointers(); - if (firewall_enabled && !is_process_elevated()) - { - trace("no privileges, skipping tests to avoid firewall dialog\n"); - return; - } - ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); ok(GetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); @@ -2130,23 +2236,50 @@ START_TEST(server) } else if (argc == 4) { - test_server_listening(); + if (!strcmp(argv[3], "listen")) + { + test_server_listening(); + } + else if(!strcmp(argv[2], "run")) + { + UINT_PTR event; + sscanf(argv[3], "%lx", &event); + run_server((HANDLE)event); + } } else { if (firewall_enabled) { - HRESULT hr = set_firewall(APP_ADD); - if (hr != S_OK) + if (is_process_elevated()) { - skip("can't authorize app in firewall %08x\n", hr); - HeapFree(GetProcessHeap(), 0, domain_and_user); - return; + HRESULT hr = set_firewall(APP_ADD); + if (hr == S_OK) + { + firewall_enabled = FALSE; + firewall_disabled = TRUE; + } + else + { + skip("can't authorize app in firewall %08x\n", hr); + } + } + else + { + trace("no privileges, skipping tests to avoid firewall dialog\n"); } } - server(); + + if (!firewall_enabled) server(); + + /* Those tests cause occasional crashes on winxp and win2k3 */ + if (GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "RpcExceptionFilter")) + test_reconnect(); + else + win_skip("Skipping reconnect tests on too old Windows version\n"); + run_client("test listen"); - if (firewall_enabled) set_firewall(APP_REMOVE); + if (firewall_disabled) set_firewall(APP_REMOVE); } HeapFree(GetProcessHeap(), 0, domain_and_user);

1 0

Jacek Caban : mshtml: Return S_OK in IHTMLDocument2::put_charset.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 481360f472b91e1a91c0f1d51183ca3be88ff2ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=481360f472b91e1a91c0f1d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 16:18:05 2018 +0200 mshtml: Return S_OK in IHTMLDocument2::put_charset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38189 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 17c9e63..fc22fa5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -910,8 +910,8 @@ static HRESULT WINAPI HTMLDocument_get_expando(IHTMLDocument2 *iface, VARIANT_BO static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + FIXME("(%p)->(%s) returning S_OK\n", This, debugstr_w(v)); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p)

1 0

Piotr Caban : wbemprox: Return NULL signature when there are no input parameters.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 91e4961d01ac250a717d67b2bff54c86734a6024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91e4961d01ac250a717d67b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 08:47:20 2018 +0200 wbemprox: Return NULL signature when there are no input parameters. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 14 +++++++++++--- dlls/wbemprox/tests/query.c | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index cc54fd5..983834d 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -839,6 +839,13 @@ HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_di heap_free( query ); if (hr != S_OK) return hr; + if (!count_instances( iter )) + { + *sig = NULL; + IEnumWbemClassObject_Release( iter ); + return S_OK; + } + if (!(name = build_signature_table_name( class, method, dir ))) { IEnumWbemClassObject_Release( iter ); @@ -873,9 +880,9 @@ static HRESULT WINAPI class_object_GetMethod( if (hr == S_OK) { if (ppInSignature) *ppInSignature = in; - else IWbemClassObject_Release( in ); + else if (in) IWbemClassObject_Release( in ); if (ppOutSignature) *ppOutSignature = out; - else IWbemClassObject_Release( out ); + else if (out) IWbemClassObject_Release( out ); } else IWbemClassObject_Release( in ); return hr; @@ -939,7 +946,8 @@ static HRESULT WINAPI class_object_NextMethod( if (hr != S_OK) { SysFreeString( method ); - IWbemClassObject_Release( *ppInSignature ); + if (*ppInSignature) + IWbemClassObject_Release( *ppInSignature ); } else { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 168c290..95690cf 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -415,7 +415,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE(full_path_fmt)]; BSTR class, method; - IWbemClassObject *process, *out; + IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; VARIANT user, domain, retval, val; DWORD full_path_len = 0; @@ -442,8 +442,10 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) win_skip( "Win32_Process not available\n" ); return; } - hr = IWbemClassObject_GetMethod( process, getownerW, 0, NULL, NULL ); + sig_in = (void*)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, getownerW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); + ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); out = NULL;

1 0

Jacek Caban : server: Use pipe_end_get_file_info for FilePipeLocalInformation implementation.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 36c6a16c6265a8ed1be9f6ca3103aa78c9013700 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36c6a16c6265a8ed1be9f6ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 13:40:36 2018 +0200 server: Use pipe_end_get_file_info for FilePipeLocalInformation implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 41 +++-------------------------------------- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 51 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b2749a6..41e330d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2200,6 +2200,8 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; + if (io->u.Status == STATUS_OBJECT_TYPE_MISMATCH) + FIXME( "Unsupported info class %x\n", info_class ); return io->u.Status; } @@ -2310,7 +2312,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FilePipeInformation && class != FilePipeLocalInformation && class != FileAccessInformation) + if (class != FilePipeInformation && class != FileAccessInformation) { if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) { @@ -2458,43 +2460,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, SERVER_END_REQ; } break; - case FilePipeLocalInformation: - { - FILE_PIPE_LOCAL_INFORMATION* pli = ptr; - - SERVER_START_REQ( get_named_pipe_info ) - { - req->handle = wine_server_obj_handle( hFile ); - if (!(io->u.Status = wine_server_call( req ))) - { - pli->NamedPipeType = (reply->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) ? - FILE_PIPE_TYPE_MESSAGE : FILE_PIPE_TYPE_BYTE; - switch (reply->sharing) - { - case FILE_SHARE_READ: - pli->NamedPipeConfiguration = FILE_PIPE_OUTBOUND; - break; - case FILE_SHARE_WRITE: - pli->NamedPipeConfiguration = FILE_PIPE_INBOUND; - break; - case FILE_SHARE_READ | FILE_SHARE_WRITE: - pli->NamedPipeConfiguration = FILE_PIPE_FULL_DUPLEX; - break; - } - pli->MaximumInstances = reply->maxinstances; - pli->CurrentInstances = reply->instances; - pli->InboundQuota = reply->insize; - pli->ReadDataAvailable = 0; /* FIXME */ - pli->OutboundQuota = reply->outsize; - pli->WriteQuotaAvailable = 0; /* FIXME */ - pli->NamedPipeState = 0; /* FIXME */ - pli->NamedPipeEnd = (reply->flags & NAMED_PIPE_SERVER_END) ? - FILE_PIPE_SERVER_END : FILE_PIPE_CLIENT_END; - } - } - SERVER_END_REQ; - } - break; case FileNameInformation: { FILE_NAME_INFORMATION *info = ptr; diff --git a/server/fd.c b/server/fd.c index 6118f52..b26b111 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2170,7 +2170,7 @@ int no_fd_flush( struct fd *fd, struct async *async ) } /* default get_file_info() routine */ -void no_fd_get_file_info( struct fd *fd, unsigned int info_class ) +void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); } @@ -2391,7 +2391,7 @@ DECL_HANDLER(get_file_info) if (fd) { - fd->fd_ops->get_file_info( fd, req->info_class ); + fd->fd_ops->get_file_info( fd, req->handle, req->info_class ); release_object( fd ); } } diff --git a/server/file.h b/server/file.h index 8609db0..8a47333 100644 --- a/server/file.h +++ b/server/file.h @@ -63,7 +63,7 @@ struct fd_ops /* flush the object buffers */ int (*flush)(struct fd *, struct async *); /* query file info */ - void (*get_file_info)( struct fd *, unsigned int ); + void (*get_file_info)( struct fd *, obj_handle_t, unsigned int ); /* query volume info */ void (*get_volume_info)( struct fd *, unsigned int ); /* perform an ioctl on the file */ @@ -111,7 +111,7 @@ extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); -extern void no_fd_get_file_info( struct fd *fd, unsigned int info_class ); +extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void no_fd_get_volume_info( struct fd *fd, unsigned int info_class ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/named_pipe.c b/server/named_pipe.c index ae2f2de..a2cc520 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -145,7 +145,7 @@ static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t p static int pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); -static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class ); +static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); @@ -509,7 +509,7 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) return 1; } -static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class ) +static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) { struct pipe_end *pipe_end = get_fd_user( fd ); struct named_pipe *pipe = pipe_end->pipe; @@ -555,8 +555,49 @@ static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class ) if (reply_size) memcpy( &name_info->FileName[1], name, reply_size ); break; } + case FilePipeLocalInformation: + { + FILE_PIPE_LOCAL_INFORMATION *pipe_info; + + if (!(get_handle_access( current->process, handle) & FILE_READ_ATTRIBUTES)) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + + if (get_reply_max_size() < sizeof(*pipe_info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + + if (!(pipe_info = set_reply_data_size( sizeof(*pipe_info) ))) return; + pipe_info->NamedPipeType = (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) != 0; + switch (pipe->sharing) + { + case FILE_SHARE_READ: + pipe_info->NamedPipeConfiguration = FILE_PIPE_OUTBOUND; + break; + case FILE_SHARE_WRITE: + pipe_info->NamedPipeConfiguration = FILE_PIPE_INBOUND; + break; + case FILE_SHARE_READ | FILE_SHARE_WRITE: + pipe_info->NamedPipeConfiguration = FILE_PIPE_FULL_DUPLEX; + break; + } + pipe_info->MaximumInstances = pipe->maxinstances; + pipe_info->CurrentInstances = pipe->instances; + pipe_info->InboundQuota = pipe->insize; + pipe_info->ReadDataAvailable = 0; /* FIXME */ + pipe_info->OutboundQuota = pipe->outsize; + pipe_info->WriteQuotaAvailable = 0; /* FIXME */ + pipe_info->NamedPipeState = 0; /* FIXME */ + pipe_info->NamedPipeEnd = pipe_end->obj.ops == &pipe_server_ops + ? FILE_PIPE_SERVER_END : FILE_PIPE_CLIENT_END; + break; + } default: - no_fd_get_file_info( fd, info_class ); + no_fd_get_file_info( fd, handle, info_class ); } }

1 0

Jacek Caban : server: Use pipe_end_get_file_info for FilePipeInformation implementation.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 5f43a1b93eb4aed84b8038e0bb42875fee9aef4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f43a1b93eb4aed84b8038e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 13:41:00 2018 +0200 server: Use pipe_end_get_file_info for FilePipeInformation implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 20 +-------------- include/wine/server_protocol.h | 22 +---------------- server/named_pipe.c | 56 +++++++++++++++++------------------------- server/protocol.def | 12 --------- server/request.h | 11 --------- server/trace.c | 18 -------------- 6 files changed, 25 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f43a1b93eb4aed84b80…

1 0

Jacek Caban : server: Support NamedPipeState in FilePipeLocalInformation.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 68a32b8c8ec34dae99dca9091d1700be03979795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a32b8c8ec34dae99dca909… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 13:41:08 2018 +0200 server: Support NamedPipeState in FilePipeLocalInformation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index dcd7c3c..e04672b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1415,7 +1415,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); if (!status) - todo_wine ok(local_info.NamedPipeState == state, "%s NamedPipeState = %u, expected %u\n", is_server ? "server" : "client", local_info.NamedPipeState, state); @@ -1631,7 +1630,6 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) todo_wine ok(local_info.WriteQuotaAvailable == (is_server ? 200 : 100), "WriteQuotaAvailable = %u\n", local_info.WriteQuotaAvailable); - todo_wine ok(local_info.NamedPipeState == state, "%s NamedPipeState = %u, expected %u\n", is_server ? "server" : "client", local_info.NamedPipeState, state); ok(local_info.NamedPipeEnd == is_server, "NamedPipeEnd = %u\n", local_info.NamedPipeEnd); diff --git a/server/named_pipe.c b/server/named_pipe.c index dd2bd8c..3e0da4f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -614,7 +614,7 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned pipe_info->ReadDataAvailable = 0; /* FIXME */ pipe_info->OutboundQuota = pipe->outsize; pipe_info->WriteQuotaAvailable = 0; /* FIXME */ - pipe_info->NamedPipeState = 0; /* FIXME */ + pipe_info->NamedPipeState = pipe_end->state; pipe_info->NamedPipeEnd = pipe_end->obj.ops == &pipe_server_ops ? FILE_PIPE_SERVER_END : FILE_PIPE_CLIENT_END; break;

1 0

Zebediah Figura : rpcrt4/tests: Use publicly defined NDR constants.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 99672dbe9167bea9cf8bc6fa918f6c2583f8066d URL: https://source.winehq.org/git/wine.git/?a=commit;h=99672dbe9167bea9cf8bc6fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 16 18:49:51 2018 -0500 rpcrt4/tests: Use publicly defined NDR constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 21baba7..586a7ef 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -35,6 +35,7 @@ #include "rpcdce.h" #include "rpcproxy.h" #include "midles.h" +#include "ndrtypes.h" static int my_alloc_called; static int my_free_called; @@ -154,17 +155,17 @@ static void test_ndr_simple_type(void) StubMsg.BufferLength = 16; StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); l = 0xcafebabe; - NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 4, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(*(LONG*)StubMsg.BufferStart == l, "%d\n", *(LONG*)StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart + 1; - NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(*(LONG*)(StubMsg.BufferStart + 4) == l, "%d\n", *(LONG*)StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart + 1; - NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, 8 /* FC_LONG */); + NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(l2 == l, "%d\n", l2); @@ -230,7 +231,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); @@ -240,7 +241,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *) + 16, "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + 16, "%s: mem size %u\n", msgpfx, size); @@ -250,19 +251,19 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *) + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); size = srcsize; - if(formattypes[1] & 0x10) size += 4; + if (formattypes[1] & FC_POINTER_DEREF) size += 4; StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -275,7 +276,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, /* reset the buffer and call with must alloc */ StubMsg.Buffer = StubMsg.BufferStart; - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 1 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -291,7 +292,7 @@ todo_wine { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); } my_alloc_called = 0; - if(formattypes[0] != 0x11 /* FC_RP */) + if (formattypes[0] != FC_RP) { /* now pass the address of a NULL ptr */ mem = NULL; @@ -314,14 +315,15 @@ todo_wine { StubMsg.IsClient = 0; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - if (formattypes[2] == 0xd /* FC_ENUM16 */) + if (formattypes[2] == FC_ENUM16) ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); else ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); - if (formattypes[2] != 0xd /* FC_ENUM16 */) { + if (formattypes[2] != FC_ENUM16) + { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; }

1 0

Zebediah Figura : rpcrt4/tests: Test that NdrPointerFree() doesn' t free stack pointers.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: f95777e134ce6a1e4fdc20151add7e94dc41656e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95777e134ce6a1e4fdc2015… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 16 18:49:52 2018 -0500 rpcrt4/tests: Test that NdrPointerFree() doesn't free stack pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 58 +++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 586a7ef..2938b87 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -187,7 +187,6 @@ static void test_pointer_marshal(const unsigned char *formattypes, void *ptr; unsigned char *mem, *mem_orig; - my_alloc_called = my_free_called = 0; if(!cmp) cmp = memcmp; @@ -261,8 +260,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; - mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - + /* Using my_alloc() here is necessary to prevent a crash in Windows 7+. */ + mem_orig = mem = my_alloc(size); + memset(mem, 0, size); + my_alloc_called = my_free_called = 0; if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); @@ -271,11 +272,24 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); - ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + /* On Windows 7+ unmarshalling may involve calls to NdrFree, for unclear reasons. */ + my_free_called = 0; + + NdrPointerFree(&StubMsg, mem, formattypes); + if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) + { + /* In this case the top-level pointer is not freed. */ + ok(my_free_called == num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, mem); + } + else + ok(my_free_called == 1 + num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); /* reset the buffer and call with must alloc */ + my_alloc_called = my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; + mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 1 ); @@ -291,11 +305,23 @@ todo_wine { todo_wine { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); } - my_alloc_called = 0; + ok(!my_free_called, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + NdrPointerFree(&StubMsg, mem, formattypes); + if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) + { + /* In this case the top-level pointer is not freed. */ + ok(my_free_called == num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, mem); + } + else + ok(my_free_called == 1 + num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + if (formattypes[0] != FC_RP) { /* now pass the address of a NULL ptr */ mem = NULL; + my_alloc_called = my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -329,7 +355,6 @@ todo_wine { } } } - HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); } @@ -381,15 +406,15 @@ static void test_simple_types(void) 0x2, /* FC_CHAR */ 0x5c, /* FC_PAD */ }; - static const unsigned char fmtstr_rpup_char[] = + static const unsigned char fmtstr_rpup_char_onstack_deref[] = { - 0x11, 0x14, /* FC_RP [alloced_on_stack] */ + 0x11, 0x14, /* FC_RP [alloced_on_stack] [pointer_deref] */ NdrFcShort( 0x2 ), /* Offset= 2 (4) */ 0x12, 0x8, /* FC_UP [simple_pointer] */ 0x2, /* FC_CHAR */ 0x5c, /* FC_PAD */ }; - static const unsigned char fmtstr_rpup_char2[] = + static const unsigned char fmtstr_rpup_char_onstack[] = { 0x11, 0x04, /* FC_RP [alloced_on_stack] */ NdrFcShort( 0x2 ), /* Offset= 2 (4) */ @@ -397,6 +422,14 @@ static void test_simple_types(void) 0x2, /* FC_CHAR */ 0x5c, /* FC_PAD */ }; + static const unsigned char fmtstr_rpup_char_deref[] = + { + 0x11, 0x10, /* FC_RP [pointer_deref] */ + NdrFcShort( 0x2 ), /* Offset= 2 (4) */ + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x2, /* FC_CHAR */ + 0x5c, /* FC_PAD */ + }; static const unsigned char fmtstr_up_wchar[] = { @@ -481,8 +514,9 @@ static void test_simple_types(void) test_pointer_marshal(fmtstr_rp_char, ch_ptr, 1, &ch, 1, NULL, 0, "rp_char"); - test_pointer_marshal(fmtstr_rpup_char, &ch_ptr, 1, wiredata, 5, deref_cmp, 1, "rpup_char"); - test_pointer_marshal(fmtstr_rpup_char2, ch_ptr, 1, wiredata, 5, NULL, 0, "rpup_char2"); + test_pointer_marshal(fmtstr_rpup_char_onstack_deref, &ch_ptr, 1, wiredata, 5, deref_cmp, 1, "rpup_char_onstack_deref"); + test_pointer_marshal(fmtstr_rpup_char_onstack, ch_ptr, 1, wiredata, 5, NULL, 0, "rpup_char_onstack"); + test_pointer_marshal(fmtstr_rpup_char_deref, &ch_ptr, 1, wiredata, 5, deref_cmp, 1, "rpup_char_deref"); s = 0xa597; if (use_pointer_ids)

1 0

Józef Kucia : vkd3d-shader: Constify vkd3d_dxbc_compiler pointers.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: vkd3d Branch: master Commit: 86b4c8c9de7a1e5631982ffb52349c5eaab2df78 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=86b4c8c9de7a1e5631982ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 17 17:59:31 2018 +0200 vkd3d-shader: Constify vkd3d_dxbc_compiler pointers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 644c0a7..e9726dd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1982,13 +1982,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } -static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(struct vkd3d_dxbc_compiler *compiler) +static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; } -static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { switch (visibility) @@ -2012,7 +2012,7 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compil } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( - struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) + const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) { unsigned int reg_idx = reg->idx[0].offset; unsigned int i; @@ -2362,7 +2362,7 @@ struct vkd3d_shader_register_info unsigned int structure_stride; }; -static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { struct vkd3d_symbol reg_symbol, *symbol; @@ -3044,7 +3044,7 @@ vkd3d_register_builtins[] = }; static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( - struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { enum vkd3d_shader_target target; unsigned int i; @@ -3080,7 +3080,7 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_register( return NULL; } -static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(struct vkd3d_dxbc_compiler *compiler, +static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_input_sysval_semantic sysval) { const struct vkd3d_spirv_builtin *builtin; @@ -3293,7 +3293,7 @@ static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( return register_idx; } -static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compiler, +static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { const struct vkd3d_shader_compile_arguments *compile_args;

1 0