April 2006 - Wine-Commits - list.winehq.org

Robert Shearman : rpcrt4: Free all pointers by default, except for conformant strings.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 8d36337644598f969f9bd58eed1260a82515356f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d36337644598f969f9bd58… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:45:16 2006 +0100 rpcrt4: Free all pointers by default, except for conformant strings. Free all pointers by default, except for conformant strings. Conformant arrays should always be freed. Add FC_CVARRAY to list of known types to avoid a FIXME. --- dlls/rpcrt4/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b890499..4868723 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -909,10 +909,12 @@ void WINAPI PointerFree(PMIDL_STUB_MESSA case RPC_FC_BOGUS_STRUCT: case RPC_FC_BOGUS_ARRAY: case RPC_FC_USER_MARSHAL: + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: break; default: FIXME("unhandled data type=%02x\n", *desc); - case RPC_FC_CARRAY: + break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: if (pStubMsg->ReuseBuffer) goto notfree;

1 0

Robert Shearman : rpcrt4: Fix some memory leaks.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: b36d5fa11fd6e4a155ba5023a633e2c05585c316 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b36d5fa11fd6e4a155ba502… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:44:53 2006 +0100 rpcrt4: Fix some memory leaks. --- dlls/rpcrt4/rpc_binding.c | 5 +++++ dlls/rpcrt4/rpc_server.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 63f0259..9b3e705 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -446,6 +446,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding InterfaceId, TransferSyntax); status = RPCRT4_Send(*Connection, hdr, NULL, 0); + RPCRT4_FreeHeader(hdr); if (status != RPC_S_OK) { RPCRT4_DestroyConnection(*Connection); return status; @@ -461,6 +462,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding count = rpcrt4_conn_read(NewConnection, response, RPC_MAX_PACKET_SIZE); if (count < sizeof(response_hdr->common)) { WARN("received invalid header\n"); + HeapFree(GetProcessHeap(), 0, response); RPCRT4_DestroyConnection(*Connection); return RPC_S_PROTOCOL_ERROR; } @@ -471,12 +473,14 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding response_hdr->common.rpc_ver_minor != RPC_VER_MINOR || response_hdr->common.ptype != PKT_BIND_ACK) { WARN("invalid protocol version or rejection packet\n"); + HeapFree(GetProcessHeap(), 0, response); RPCRT4_DestroyConnection(*Connection); return RPC_S_PROTOCOL_ERROR; } if (response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) { WARN("server doesn't allow large enough packets\n"); + HeapFree(GetProcessHeap(), 0, response); RPCRT4_DestroyConnection(*Connection); return RPC_S_PROTOCOL_ERROR; } @@ -485,6 +489,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding (*Connection)->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; (*Connection)->ActiveInterface = *InterfaceId; + HeapFree(GetProcessHeap(), 0, response); } return RPC_S_OK; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d8eaa6b..96b3a44 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -261,7 +261,9 @@ static void RPCRT4_process_packet(RpcCon conn->MaxTransmissionSize = hdr->bind.max_tsize; } - if (RPCRT4_Send(conn, response, NULL, 0) != RPC_S_OK) + status = RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + if (status != RPC_S_OK) goto fail; break; @@ -275,6 +277,7 @@ static void RPCRT4_process_packet(RpcCon status); RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); break; } @@ -342,6 +345,7 @@ fail: msg->Buffer = NULL; RPCRT4_FreeHeader(hdr); TlsSetValue(worker_tls, NULL); + HeapFree(GetProcessHeap(), 0, msg); } static DWORD CALLBACK RPCRT4_worker_thread(LPVOID the_arg) @@ -414,6 +418,7 @@ static DWORD CALLBACK RPCRT4_io_thread(L status = RPCRT4_Receive(conn, &hdr, msg); if (status != RPC_S_OK) { WARN("receive failed with error %lx\n", status); + HeapFree(GetProcessHeap(), 0, msg); break; } @@ -430,7 +435,6 @@ #else #endif msg = NULL; } - HeapFree(GetProcessHeap(), 0, msg); RPCRT4_DestroyConnection(conn); return 0; } @@ -1001,6 +1005,8 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListe LeaveCriticalSection(&listen_cs); + FIXME("not waiting for server calls to finish\n"); + return RPC_S_OK; }

1 0

Robert Shearman : rpcrt4: Use the documented NDR_PROC_HEADER_EXTS structure .
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 98facf4d0fb6296a73b4d4b0650e41a73f688f90 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98facf4d0fb6296a73b4d4b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:44:41 2006 +0100 rpcrt4: Use the documented NDR_PROC_HEADER_EXTS structure. Use the documented NDR_PROC_HEADER_EXTS structure instead of the current NDR_PROC_EXTENSIONS structure currently in ndr_stubless.c. --- dlls/rpcrt4/ndr_stubless.c | 69 ++++++++++---------------------------------- include/ndrtypes.h | 55 +++++++++++++++++++++++++++++++++++ include/wine/rpcfc.h | 5 --- 3 files changed, 71 insertions(+), 58 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 442e4fe..0131034 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -204,43 +204,6 @@ typedef struct _NDR_PROC_PARTIAL_OIF_HEA unsigned char number_of_params; } NDR_PROC_PARTIAL_OIF_HEADER; -/* Windows 2000 extensions */ -typedef struct _NDR_PROC_EXTENSION -{ - /* size in bytes of all following extensions */ - unsigned char extension_version; - - /* extension flags: - * HasNewCorrDesc = 0x01 - indicates new correlation descriptors in use - * ClientCorrCheck = 0x02 - client needs correlation check - * ServerCorrCheck = 0x04 - server needs correlation check - * HasNotify = 0x08 - should call MIDL [notify] routine @ NotifyIndex - * HasNotify2 = 0x10 - should call MIDL [notify_flag] routine @ - * NotifyIndex - */ - unsigned char ext_flags; - - /* client cache size hint */ - unsigned short ClientCorrHint; - - /* server cache size hint */ - unsigned short ServerCorrHint; - - /* index of routine in MIDL_STUB_DESC::NotifyRoutineTable to call if - * HasNotify or HasNotify2 flag set */ - unsigned short NotifyIndex; -} NDR_PROC_EXTENSION; - -/* usually generated only on IA64 */ -typedef struct _NDR_PROC_EXTENSION_64 -{ - NDR_PROC_EXTENSION ext; - - /* needed only on IA64 to cope with float/register loading */ - unsigned short FloatDoubleMask; -} NDR_PROC_EXTENSION_64; - - typedef struct _NDR_PARAM_OI_BASETYPE { /* parameter direction. One of: @@ -431,8 +394,8 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST unsigned short i; /* cache of Oif_flags from v2 procedure header */ INTERPRETER_OPT_FLAGS Oif_flags = { 0 }; - /* cache of extension flags from NDR_PROC_EXTENSION */ - unsigned char ext_flags = 0; + /* cache of extension flags from NDR_PROC_HEADER_EXTS */ + INTERPRETER_OPT_FLAGS2 ext_flags = { 0 }; /* the type of pass we are currently doing */ int phase; /* header for procedure string */ @@ -560,10 +523,10 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST if (Oif_flags.HasExtensions) { - NDR_PROC_EXTENSION * pExtensions = - (NDR_PROC_EXTENSION *)&pFormat[current_offset]; - ext_flags = pExtensions->ext_flags; - current_offset += pExtensions->extension_version; + NDR_PROC_HEADER_EXTS * pExtensions = + (NDR_PROC_HEADER_EXTS *)&pFormat[current_offset]; + ext_flags = pExtensions->Flags2; + current_offset += pExtensions->Size; } if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) @@ -602,7 +565,7 @@ #endif /* init pipes package */ /* NdrPipesInitialize(...) */ } - if (ext_flags & RPC_FC_PROC_EXT_NEWCORRDESC) + if (ext_flags.HasNewCorrDesc) { /* initialize extra correlation package */ FIXME("new correlation description not implemented\n"); @@ -887,7 +850,7 @@ #endif /* FIXME: unbind the binding handle */ - if (ext_flags & RPC_FC_PROC_EXT_NEWCORRDESC) + if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ /* NdrCorrelationFree(&stubMsg); */ @@ -997,8 +960,8 @@ long WINAPI NdrStubCall2( unsigned short i; /* cache of Oif_flags from v2 procedure header */ INTERPRETER_OPT_FLAGS Oif_flags = { 0 }; - /* cache of extension flags from NDR_PROC_EXTENSION */ - unsigned char ext_flags = 0; + /* cache of extension flags from NDR_PROC_HEADER_EXTS */ + INTERPRETER_OPT_FLAGS2 ext_flags = { 0 }; /* the type of pass we are currently doing */ int phase; /* header for procedure string */ @@ -1093,10 +1056,10 @@ long WINAPI NdrStubCall2( if (Oif_flags.HasExtensions) { - NDR_PROC_EXTENSION * pExtensions = - (NDR_PROC_EXTENSION *)&pFormat[current_offset]; - ext_flags = pExtensions->ext_flags; - current_offset += pExtensions->extension_version; + NDR_PROC_HEADER_EXTS * pExtensions = + (NDR_PROC_HEADER_EXTS *)&pFormat[current_offset]; + ext_flags = pExtensions->Flags2; + current_offset += pExtensions->Size; } if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) @@ -1131,7 +1094,7 @@ #endif /* init pipes package */ /* NdrPipesInitialize(...) */ } - if (ext_flags & RPC_FC_PROC_EXT_NEWCORRDESC) + if (ext_flags.HasNewCorrDesc) { /* initialize extra correlation package */ FIXME("new correlation description not implemented\n"); @@ -1441,7 +1404,7 @@ #endif pRpcMsg->BufferLength = (unsigned int)(stubMsg.Buffer - (unsigned char *)pRpcMsg->Buffer); - if (ext_flags & RPC_FC_PROC_EXT_NEWCORRDESC) + if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ /* NdrCorrelationFree(&stubMsg); */ diff --git a/include/ndrtypes.h b/include/ndrtypes.h index d7796ee..1cc91ad 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -71,4 +71,59 @@ typedef struct * procedure. */ } INTERPRETER_OPT_FLAGS, *PINTERPRETER_OPT_FLAGS; +typedef struct +{ + unsigned char HasNewCorrDesc : 1; /* 0x01 - indicates new correlation + * descriptors in use. */ + unsigned char ClientCorrCheck : 1; /* 0x02 - client needs correlation + * check. */ + unsigned char ServerCorrCheck : 1; /* 0x04 - server needs correlation + * check. */ + unsigned char HasNotify : 1; /* 0x08 - should call MIDL [notify] + * routine @ NotifyIndex. */ + unsigned char HasNotify2 : 1; /* 0x10 - should call MIDL [notify_flag] routine @ + * NotifyIndex. */ + unsigned char Unused : 3; +} INTERPRETER_OPT_FLAGS2, *PINTERPRETER_OPT_FLAGS2; + +/* Win2000 extensions */ +typedef struct +{ + /* size in bytes of all following extensions */ + unsigned char Size; + + INTERPRETER_OPT_FLAGS2 Flags2; + + /* client cache size hint */ + unsigned short ClientCorrHint; + + /* server cache size hint */ + unsigned short ServerCorrHint; + + /* index of routine in MIDL_STUB_DESC::NotifyRoutineTable to call if + * HasNotify or HasNotify2 flag set */ + unsigned short NotifyIndex; +} NDR_PROC_HEADER_EXTS; + +typedef struct +{ + /* size in bytes of all following extensions */ + unsigned char Size; + + INTERPRETER_OPT_FLAGS2 Flags2; + + /* client cache size hint */ + unsigned short ClientCorrHint; + + /* server cache size hint */ + unsigned short ServerCorrHint; + + /* index of routine in MIDL_STUB_DESC::NotifyRoutineTable to call if + * HasNotify or HasNotify2 flag set */ + unsigned short NotifyIndex; + + /* needed only on IA64 to cope with float/register loading */ + unsigned short FloatArgMask; +} NDR_PROC_HEADER_EXTS64; + #endif diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 5761a01..9e1003c 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -172,11 +172,6 @@ #define RPC_FC_PROC_PF_SIMPLEREF #define RPC_FC_PROC_PF_DONTFREEINST 0x0200 #define RPC_FC_PROC_PF_SAVEASYNC 0x0400 #define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */ -#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01 -#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02 -#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04 -#define RPC_FC_PROC_EXT_HASNOTIFY 0x08 -#define RPC_FC_PROC_EXT_HASNOTIFY2 0x10 /* correlation types */ #define RPC_FC_NORMAL_CONFORMANCE 0x00

1 0

Robert Shearman : rpcrt4: Use INTERPRETER_OPT_FLAGS in ndrtypes. h instead of flags on an unsigned char.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 28f494e31acad4c22666321a7acb00e605f6d6c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28f494e31acad4c22666321… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:44:27 2006 +0100 rpcrt4: Use INTERPRETER_OPT_FLAGS in ndrtypes.h instead of flags on an unsigned char. --- dlls/rpcrt4/ndr_stubless.c | 57 ++++++++++++++++++++++---------------------- include/ndrtypes.h | 17 +++++++++++++ include/wine/rpcfc.h | 7 ----- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index b9d379e..442e4fe 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -198,21 +198,7 @@ typedef struct _NDR_PROC_PARTIAL_OIF_HEA * sizing pass */ unsigned short constant_server_buffer_size; - /* -Oif flags: - * RPC_FC_PROC_OI2F_SRVMUSTSIZE = 0x01 - the server must perform a - * sizing pass. - * RPC_FC_PROC_OI2F_CLTMUSTSIZE = 0x02 - the client must perform a - * sizing pass. - * RPC_FC_PROC_OI2F_HASRETURN = 0x04 - procedure has a return value. - * RPC_FC_PROC_OI2F_HASPIPES = 0x08 - the pipe package should be used. - * RPC_FC_PROC_OI2F_HASASYNCUUID = 0x20 - indicates an asynchronous DCOM - * procedure. - * RPC_FC_PROC_OI2F_HASEXTS = 0x40 - indicates that Windows 2000 - * extensions are in use. - * RPC_FC_PROC_OI2F_HASASYNCHND = 0x80 - indicates an asynchronous RPC - * procedure. - */ - unsigned char Oif_flags; + INTERPRETER_OPT_FLAGS Oi2Flags; /* number of params */ unsigned char number_of_params; @@ -406,6 +392,19 @@ static void WINAPI dump_RPC_FC_PROC_PF(P if (param_attributes.ServerAllocSize) TRACE(" ServerAllocSize = %d", param_attributes.ServerAllocSize * 8); } +static void WINAPI dump_INTERPRETER_OPT_FLAGS(INTERPRETER_OPT_FLAGS Oi2Flags) +{ + if (Oi2Flags.ServerMustSize) TRACE(" ServerMustSize"); + if (Oi2Flags.ClientMustSize) TRACE(" ClientMustSize"); + if (Oi2Flags.HasReturn) TRACE(" HasReturn"); + if (Oi2Flags.HasPipes) TRACE(" HasPipes"); + if (Oi2Flags.Unused) TRACE(" Unused"); + if (Oi2Flags.HasAsyncUuid) TRACE(" HasAsyncUuid"); + if (Oi2Flags.HasExtensions) TRACE(" HasExtensions"); + if (Oi2Flags.HasAsyncHandle) TRACE(" HasAsyncHandle"); + TRACE("\n"); +} + /* FIXME: this will be different on other plaftorms than i386 */ #define ARG_FROM_OFFSET(args, offset) (*(unsigned char **)args + offset) @@ -431,7 +430,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST /* counter */ unsigned short i; /* cache of Oif_flags from v2 procedure header */ - unsigned char Oif_flags = 0; + INTERPRETER_OPT_FLAGS Oif_flags = { 0 }; /* cache of extension flags from NDR_PROC_EXTENSION */ unsigned char ext_flags = 0; /* the type of pass we are currently doing */ @@ -551,15 +550,15 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST NDR_PROC_PARTIAL_OIF_HEADER * pOIFHeader = (NDR_PROC_PARTIAL_OIF_HEADER*)&pFormat[current_offset]; - Oif_flags = pOIFHeader->Oif_flags; + Oif_flags = pOIFHeader->Oi2Flags; number_of_params = pOIFHeader->number_of_params; current_offset += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); } - TRACE("Oif_flags = 0x%02x\n", Oif_flags); + TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); - if (Oif_flags & RPC_FC_PROC_OI2F_HASEXTS) + if (Oif_flags.HasExtensions) { NDR_PROC_EXTENSION * pExtensions = (NDR_PROC_EXTENSION *)&pFormat[current_offset]; @@ -596,7 +595,7 @@ #endif if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCSSALLOC) NdrRpcSmSetClientToOsf(&stubMsg); - if (Oif_flags & RPC_FC_PROC_OI2F_HASPIPES) + if (Oif_flags.HasPipes) { FIXME("pipes not supported yet\n"); RpcRaiseException(RPC_X_WRONG_STUB_VERSION); /* FIXME: remove when implemented */ @@ -628,7 +627,7 @@ #endif /* allocate the buffer */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) NdrProxyGetBuffer(This, &stubMsg); - else if (Oif_flags & RPC_FC_PROC_OI2F_HASPIPES) + else if (Oif_flags.HasPipes) /* NdrGetPipeBuffer(...) */ FIXME("pipes not supported yet\n"); else @@ -648,7 +647,7 @@ #endif * params */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) NdrProxySendReceive(This, &stubMsg); - else if (Oif_flags & RPC_FC_PROC_OI2F_HASPIPES) + else if (Oif_flags.HasPipes) /* NdrPipesSendReceive(...) */ FIXME("pipes not supported yet\n"); else @@ -894,7 +893,7 @@ #endif /* NdrCorrelationFree(&stubMsg); */ } - if (Oif_flags & RPC_FC_PROC_OI2F_HASPIPES) + if (Oif_flags.HasPipes) { /* NdrPipesDone(...) */ } @@ -997,7 +996,7 @@ long WINAPI NdrStubCall2( /* counter */ unsigned short i; /* cache of Oif_flags from v2 procedure header */ - unsigned char Oif_flags = 0; + INTERPRETER_OPT_FLAGS Oif_flags = { 0 }; /* cache of extension flags from NDR_PROC_EXTENSION */ unsigned char ext_flags = 0; /* the type of pass we are currently doing */ @@ -1084,15 +1083,15 @@ long WINAPI NdrStubCall2( NDR_PROC_PARTIAL_OIF_HEADER * pOIFHeader = (NDR_PROC_PARTIAL_OIF_HEADER*)&pFormat[current_offset]; - Oif_flags = pOIFHeader->Oif_flags; + Oif_flags = pOIFHeader->Oi2Flags; number_of_params = pOIFHeader->number_of_params; current_offset += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); } - TRACE("Oif_flags = 0x%02x\n", Oif_flags); + TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); - if (Oif_flags & RPC_FC_PROC_OI2F_HASEXTS) + if (Oif_flags.HasExtensions) { NDR_PROC_EXTENSION * pExtensions = (NDR_PROC_EXTENSION *)&pFormat[current_offset]; @@ -1125,7 +1124,7 @@ #else FIXME("Set RPCSS memory allocation routines\n"); #endif - if (Oif_flags & RPC_FC_PROC_OI2F_HASPIPES) + if (Oif_flags.HasPipes) { FIXME("pipes not supported yet\n"); RpcRaiseException(RPC_X_WRONG_STUB_VERSION); /* FIXME: remove when implemented */ @@ -1448,7 +1447,7 @@ #endif /* NdrCorrelationFree(&stubMsg); */ } - if (Oif_flags & RPC_FC_PROC_OI2F_HASPIPES) + if (Oif_flags.HasPipes) { /* NdrPipesDone(...) */ } diff --git a/include/ndrtypes.h b/include/ndrtypes.h index b20092b..d7796ee 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -54,4 +54,21 @@ typedef struct * call. */ } PARAM_ATTRIBUTES; +typedef struct +{ + unsigned char ServerMustSize : 1; /* 0x01 - the server must perform a + * sizing pass. */ + unsigned char ClientMustSize : 1; /* 0x02 - the client must perform a + * sizing pass. */ + unsigned char HasReturn : 1; /* 0x04 - procedure has a return value. */ + unsigned char HasPipes : 1; /* 0x08 - the pipe package should be used. */ + unsigned char Unused : 1; /* 0x10 - not used */ + unsigned char HasAsyncUuid : 1; /* 0x20 - indicates an asynchronous DCOM + * procedure. */ + unsigned char HasExtensions : 1; /* 0x40 - indicates that Win2000 + * extensions are in use. */ + unsigned char HasAsyncHandle : 1; /* 0x80 - indicates an asynchronous RPC + * procedure. */ +} INTERPRETER_OPT_FLAGS, *PINTERPRETER_OPT_FLAGS; + #endif diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 0180a27..5761a01 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -160,13 +160,6 @@ #define RPC_FC_PROC_OIF_RPCFLAGS #define RPC_FC_PROC_OIF_OBJ_V2 0x20 #define RPC_FC_PROC_OIF_NEWINIT 0x40 -#define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01 -#define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02 -#define RPC_FC_PROC_OI2F_HASRETURN 0x04 -#define RPC_FC_PROC_OI2F_HASPIPES 0x08 -#define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20 -#define RPC_FC_PROC_OI2F_HASEXTS 0x40 -#define RPC_FC_PROC_OI2F_HASASYNCHND 0x80 #define RPC_FC_PROC_PF_MUSTSIZE 0x0001 #define RPC_FC_PROC_PF_MUSTFREE 0x0002 #define RPC_FC_PROC_PF_PIPE 0x0004

1 0

Robert Shearman : rpcrt4: Store the return value on the stack for interpreted stubs.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 312df9bf7f7f34cea9f89a5bfebf4bbadbf503e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=312df9bf7f7f34cea9f89a5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:43:22 2006 +0100 rpcrt4: Store the return value on the stack for interpreted stubs. Store the return value on the stack for stubs, as MIDL reserves space for it and gives us a stack offset. This fixes calling methods with thunks that assume that the return value will be stored on the stack. --- dlls/rpcrt4/ndr_stubless.c | 90 +++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 47 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index a7f0b93..b9d379e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1010,9 +1010,8 @@ long WINAPI NdrStubCall2( int current_offset; /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; - /* the return value (not from this function, but to be put back onto - * the wire */ - LONG_PTR RetVal = 0; + /* location to put retval into */ + LONG_PTR *retval_ptr = NULL; TRACE("pThis %p, pChannel %p, pRpcMsg %p, pdwStubPhase %p\n", pThis, pChannel, pRpcMsg, pdwStubPhase); @@ -1173,16 +1172,30 @@ #endif /* call the server function */ if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum]) pServerInfo->ThunkTable[pRpcMsg->ProcNum](&stubMsg); - /* FIXME: RetVal is stored as the last argument - retrieve it */ - else if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - { - SERVER_ROUTINE *vtbl = *(SERVER_ROUTINE **)((CStdStubBuffer *)pThis)->pvServerObject; - RetVal = call_server_func(vtbl[pRpcMsg->ProcNum], args, stack_size); - } else - RetVal = call_server_func(pServerInfo->DispatchTable[pRpcMsg->ProcNum], args, stack_size); + { + SERVER_ROUTINE func; + LONG_PTR retval; + + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + SERVER_ROUTINE *vtbl = *(SERVER_ROUTINE **)((CStdStubBuffer *)pThis)->pvServerObject; + func = vtbl[pRpcMsg->ProcNum]; + } + else + func = pServerInfo->DispatchTable[pRpcMsg->ProcNum]; - TRACE("stub implementation returned %p\n", (void *)RetVal); + /* FIXME: what happens with return values that don't fit into a single register on x86? */ + retval = call_server_func(func, args, stack_size); + + if (retval_ptr) + { + TRACE("stub implementation returned 0x%lx\n", retval); + *retval_ptr = retval; + } + else + TRACE("void stub implementation\n"); + } stubMsg.Buffer = NULL; stubMsg.BufferLength = 0; @@ -1245,9 +1258,7 @@ #endif switch (phase) { case STUBLESS_MARSHAL: - if (pParam->param_attributes.IsReturn) - call_marshaller(&stubMsg, (unsigned char *)&RetVal, pTypeFormat); - else if (pParam->param_attributes.IsOut) + if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) { if (pParam->param_attributes.IsSimpleRef) call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); @@ -1264,11 +1275,14 @@ #endif else call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); } + + /* make a note of the address of the return value parameter for later */ + if (pParam->param_attributes.IsReturn) + retval_ptr = (LONG_PTR *)pArg; + break; case STUBLESS_CALCSIZE: - if (pParam->param_attributes.IsReturn) - call_buffer_sizer(&stubMsg, (unsigned char *)&RetVal, pTypeFormat); - else if (pParam->param_attributes.IsOut) + if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) { if (pParam->param_attributes.IsSimpleRef) call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); @@ -1295,9 +1309,7 @@ #endif switch (phase) { case STUBLESS_MARSHAL: - if (pParam->param_attributes.IsReturn) - call_marshaller(&stubMsg, (unsigned char *)&RetVal, pTypeFormat); - else if (pParam->param_attributes.IsOut) + if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) { if (pParam->param_attributes.IsByValue) call_marshaller(&stubMsg, pArg, pTypeFormat); @@ -1317,17 +1329,15 @@ #endif else call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); } - else if ((pParam->param_attributes.IsOut) && - !(pParam->param_attributes.IsByValue)) + else if (pParam->param_attributes.IsOut && + !pParam->param_attributes.IsByValue) { *(void **)pArg = NdrAllocate(&stubMsg, sizeof(void *)); **(void ***)pArg = 0; } break; case STUBLESS_CALCSIZE: - if (pParam->param_attributes.IsReturn) - call_buffer_sizer(&stubMsg, (unsigned char *)&RetVal, pTypeFormat); - else if (pParam->param_attributes.IsOut) + if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) { if (pParam->param_attributes.IsByValue) call_buffer_sizer(&stubMsg, pArg, pTypeFormat); @@ -1367,10 +1377,7 @@ #endif { case STUBLESS_MARSHAL: if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) - { - unsigned char *pRetVal = (unsigned char *)&RetVal; - call_marshaller(&stubMsg, (unsigned char *)&pRetVal, pTypeFormat); - } + call_marshaller(&stubMsg, pArg, pTypeFormat); break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) @@ -1378,10 +1385,7 @@ #endif break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) - { - unsigned char * pRetVal = (unsigned char *)&RetVal; - call_buffer_sizer(&stubMsg, (unsigned char *)&pRetVal, pTypeFormat); - } + call_buffer_sizer(&stubMsg, pArg, pTypeFormat); break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR); @@ -1403,13 +1407,9 @@ #endif switch (phase) { case STUBLESS_MARSHAL: - if (pParam->param_direction == RPC_FC_RETURN_PARAM) - { - unsigned char *pRetVal = (unsigned char *)&RetVal; - call_marshaller(&stubMsg, (unsigned char *)&pRetVal, pTypeFormat); - } - else if (pParam->param_direction == RPC_FC_OUT_PARAM || - pParam->param_direction == RPC_FC_IN_OUT_PARAM) + if (pParam->param_direction == RPC_FC_OUT_PARAM || + pParam->param_direction == RPC_FC_IN_OUT_PARAM || + pParam->param_direction == RPC_FC_RETURN_PARAM) call_marshaller(&stubMsg, pArg, pTypeFormat); break; case STUBLESS_UNMARSHAL: @@ -1418,13 +1418,9 @@ #endif call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); break; case STUBLESS_CALCSIZE: - if (pParam->param_direction == RPC_FC_RETURN_PARAM) - { - unsigned char * pRetVal = (unsigned char *)&RetVal; - call_buffer_sizer(&stubMsg, (unsigned char *)&pRetVal, pTypeFormat); - } - else if (pParam->param_direction == RPC_FC_OUT_PARAM || - pParam->param_direction == RPC_FC_IN_OUT_PARAM) + if (pParam->param_direction == RPC_FC_OUT_PARAM || + pParam->param_direction == RPC_FC_IN_OUT_PARAM || + pParam->param_direction == RPC_FC_RETURN_PARAM) call_buffer_sizer(&stubMsg, pArg, pTypeFormat); break; default:

1 0

Robert Shearman : rpcrt4: Correctly fill in StackTop for stubless clients/ servers.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: f4de78babebd9694e90d0c1ab400e68daed48eff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4de78babebd9694e90d0c1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:41:45 2006 +0100 rpcrt4: Correctly fill in StackTop for stubless clients/servers. Correctly fill in StackTop for stubless clients/servers so that conformance for top-level parameters works. --- dlls/rpcrt4/ndr_stubless.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 2563f2c..a7f0b93 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -585,6 +585,8 @@ #else #endif stubMsg.BufferLength = 0; + /* needed for conformance of top-level objects */ + stubMsg.StackTop = *(unsigned char **)args; /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) @@ -1138,7 +1140,6 @@ #endif stubMsg.fHasNewCorrDesc = TRUE; } - /* convert strings, floating point values and endianess into our * preferred format */ if ((pRpcMsg->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) @@ -1148,8 +1149,8 @@ #endif TRACE("allocating memory for stack of size %x\n", stack_size); - args = HeapAlloc(GetProcessHeap(), 0, stack_size); - ZeroMemory(args, stack_size); + args = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stack_size); + stubMsg.StackTop = args; /* used by conformance of top-level objects */ /* add the implicit This pointer as the first arg to the function if we * are calling an object method */

1 0

Robert Shearman : rpcrt4: There's no need to set stubMsg.StackTop twice.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 727e25d673929b674b6418bdaa5ab1cf05698dea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=727e25d673929b674b6418b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:42:16 2006 +0100 rpcrt4: There's no need to set stubMsg.StackTop twice. --- dlls/rpcrt4/ndr_stubless.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 00132e5..2563f2c 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1170,12 +1170,9 @@ #endif { case STUBLESS_CALLSERVER: /* call the server function */ - if (pServerInfo->ThunkTable) - { - stubMsg.StackTop = args; + if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum]) pServerInfo->ThunkTable[pRpcMsg->ProcNum](&stubMsg); /* FIXME: RetVal is stored as the last argument - retrieve it */ - } else if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { SERVER_ROUTINE *vtbl = *(SERVER_ROUTINE **)((CStdStubBuffer *)pThis)->pvServerObject;

1 0

Robert Shearman : rpcrt4: Fix the MSVC version of call_server_func.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: a674ec0fdaf778aa1dca2f620b355e625a08efa4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a674ec0fdaf778aa1dca2f6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Apr 20 11:42:03 2006 +0100 rpcrt4: Fix the MSVC version of call_server_func. Fix the MSVC version of call_server_func to pop the registers in the same order they were pushed. --- dlls/rpcrt4/ndr_stubless.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index ec31fda..00132e5 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -936,9 +936,9 @@ __declspec(naked) LONG_PTR __cdecl call_ rep movsd ; Copy dword blocks call [ebp+8] ; Call function lea esp, [ebp-8] ; Restore stack - pop ebp ; Restore registers - pop esi + pop esi ; Restore registers pop edi + pop ebp ret } }

1 0

Thomas Kho : x11drv: Virtual key input scrubbing in X11DRV_send_keyboard_input.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 75cd5e2101fb49ee9a7aca2f661d23604e7f619c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75cd5e2101fb49ee9a7aca2… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Apr 19 13:04:11 2006 -0700 x11drv: Virtual key input scrubbing in X11DRV_send_keyboard_input. --- dlls/x11drv/keyboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index d14de89..37ca515 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -1115,6 +1115,8 @@ void X11DRV_send_keyboard_input( WORD wV KBDLLHOOKSTRUCT hook; WORD wVkStripped; + wVk = LOBYTE(wVk); + /* strip left/right for menu, control, shift */ if (wVk == VK_LMENU || wVk == VK_RMENU) wVkStripped = VK_MENU;

1 0

Mikołaj Zalewski : progman: Add close button and sysmenu to dialogs.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: f911433ece471d62ad4ed35cbc7645a317c54f2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f911433ece471d62ad4ed35… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Apr 19 21:34:15 2006 +0200 progman: Add close button and sysmenu to dialogs. --- programs/progman/Cs.rc | 14 +++++++------- programs/progman/De.rc | 14 +++++++------- programs/progman/En.rc | 14 +++++++------- programs/progman/Es.rc | 14 +++++++------- programs/progman/Fr.rc | 14 +++++++------- programs/progman/Hu.rc | 14 +++++++------- programs/progman/It.rc | 14 +++++++------- programs/progman/Ko.rc | 14 +++++++------- programs/progman/Nl.rc | 14 +++++++------- programs/progman/No.rc | 14 +++++++------- programs/progman/Pt.rc | 18 +++++++++--------- programs/progman/Ru.rc | 14 +++++++------- programs/progman/Si.rc | 14 +++++++------- programs/progman/Tr.rc | 14 +++++++------- programs/progman/Xx.rc | 14 +++++++------- programs/progman/Zh.rc | 14 +++++++------- 16 files changed, 114 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f911433ece471d62ad4…

1 0