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

Huw Davies : oleaut32: Implement CLEANLOCALSTORAGE marshalling and fix GetLibAttr to use it.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 195ae60e976849916965f080c9d48c7f767ad197 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=195ae60e976849916965f08… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 14:28:59 2006 +0100 oleaut32: Implement CLEANLOCALSTORAGE marshalling and fix GetLibAttr to use it. Based on some documentation by Rob Shearman. --- dlls/oleaut32/usrmarshal.c | 64 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 4c765a2..c090186 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -39,6 +39,11 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) +#define ALIGNED_POINTER(_Ptr, _Align) ((LPVOID)ALIGNED_LENGTH((ULONG_PTR)(_Ptr), _Align)) +#define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) +#define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) + /* FIXME: not supposed to be here */ const CLSID CLSID_PSDispatch = { @@ -79,26 +84,58 @@ static void dump_user_flags(unsigned lon } /* CLEANLOCALSTORAGE */ -/* I'm not sure how this is supposed to work yet */ + +#define CLS_FUNCDESC 0x66 +#define CLS_LIBATTR 0x6c +#define CLS_TYPEATTR 0x74 +#define CLS_VARDESC 0x76 unsigned long WINAPI CLEANLOCALSTORAGE_UserSize(unsigned long *pFlags, unsigned long Start, CLEANLOCALSTORAGE *pstg) { - return Start + sizeof(DWORD); + ALIGN_LENGTH(Start, 3); + return Start + sizeof(DWORD); } unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, CLEANLOCALSTORAGE *pstg) { - *(DWORD*)Buffer = 0; - return Buffer + sizeof(DWORD); + ALIGN_POINTER(Buffer, 3); + *(DWORD*)Buffer = pstg->flags; + switch(pstg->flags) + { + case CLS_LIBATTR: + ITypeLib_ReleaseTLibAttr((ITypeLib*)pstg->pInterface, *(TLIBATTR**)pstg->pStorage); + break; + case CLS_TYPEATTR: + ITypeInfo_ReleaseTypeAttr((ITypeInfo*)pstg->pInterface, *(TYPEATTR**)pstg->pStorage); + break; + case CLS_FUNCDESC: + ITypeInfo_ReleaseFuncDesc((ITypeInfo*)pstg->pInterface, *(FUNCDESC**)pstg->pStorage); + break; + case CLS_VARDESC: + ITypeInfo_ReleaseVarDesc((ITypeInfo*)pstg->pInterface, *(VARDESC**)pstg->pStorage); + break; + + default: + ERR("Unknown type %lx\n", pstg->flags); + } + + *(VOID**)pstg->pStorage = NULL; + IUnknown_Release(pstg->pInterface); + pstg->pInterface = NULL; + + return Buffer + sizeof(DWORD); } unsigned char * WINAPI CLEANLOCALSTORAGE_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, CLEANLOCALSTORAGE *pstr) { - return Buffer + sizeof(DWORD); + ALIGN_POINTER(Buffer, 3); + pstr->flags = *(DWORD*)Buffer; + return Buffer + sizeof(DWORD); } void WINAPI CLEANLOCALSTORAGE_UserFree(unsigned long *pFlags, CLEANLOCALSTORAGE *pstr) { + /* Nothing to do */ } /* BSTR */ @@ -1516,6 +1553,11 @@ HRESULT CALLBACK ITypeLib_GetLibAttr_Pro { CLEANLOCALSTORAGE stg; TRACE("(%p, %p)\n", This, ppTLibAttr); + + stg.flags = 0; + stg.pStorage = NULL; + stg.pInterface = NULL; + return ITypeLib_RemoteGetLibAttr_Proxy(This, ppTLibAttr, &stg); } @@ -1524,8 +1566,18 @@ HRESULT __RPC_STUB ITypeLib_GetLibAttr_S LPTLIBATTR* ppTLibAttr, CLEANLOCALSTORAGE* pDummy) { + HRESULT hr; TRACE("(%p, %p)\n", This, ppTLibAttr); - return ITypeLib_GetLibAttr(This, ppTLibAttr); + + hr = ITypeLib_GetLibAttr(This, ppTLibAttr); + if(hr != S_OK) + return hr; + + pDummy->flags = CLS_LIBATTR; + ITypeLib_AddRef(This); + pDummy->pInterface = (IUnknown*)This; + pDummy->pStorage = ppTLibAttr; + return hr; } HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy(

1 0

Mike McCormack : rpcrt4: Use rpcrt4_conn_read in RPCRT4_OpenBinding.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 5f6ac9c484da75fd8aec4f8dfe249adf85e98934 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f6ac9c484da75fd8aec4f8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Apr 20 01:02:19 2006 +0900 rpcrt4: Use rpcrt4_conn_read in RPCRT4_OpenBinding. --- dlls/rpcrt4/rpc_binding.c | 10 ++-------- dlls/rpcrt4/rpc_binding.h | 3 +++ dlls/rpcrt4/rpc_message.c | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 8c8d8c6..63f0259 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -435,7 +435,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding /* we need to send a binding packet if we are client. */ if (!(*Connection)->server) { RpcPktHdr *hdr; - DWORD count; + LONG count; BYTE *response; RpcPktHdr *response_hdr; @@ -458,13 +458,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding return E_OUTOFMEMORY; } - /* get a reply */ - if (!ReadFile(NewConnection->conn, response, RPC_MAX_PACKET_SIZE, &count, NULL)) { - WARN("ReadFile failed with error %ld\n", GetLastError()); - RPCRT4_DestroyConnection(*Connection); - return RPC_S_PROTOCOL_ERROR; - } - + count = rpcrt4_conn_read(NewConnection, response, RPC_MAX_PACKET_SIZE); if (count < sizeof(response_hdr->common)) { WARN("received invalid header\n"); RPCRT4_DestroyConnection(*Connection); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 5a65e48..52cff54 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -83,4 +83,7 @@ BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_ HANDLE RPCRT4_GetMasterMutex(void); HANDLE RPCRT4_RpcssNPConnect(void); +int rpcrt4_conn_read(RpcConnection *Connection, + void *buffer, unsigned int count); + #endif diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 6e89ace..1e1c20c 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -306,8 +306,8 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co * * Reads data from a connection */ -static int rpcrt4_conn_read(RpcConnection *Connection, - void *buffer, unsigned int count) +int rpcrt4_conn_read(RpcConnection *Connection, + void *buffer, unsigned int count) { DWORD dwRead = 0; if (!ReadFile(Connection->conn, buffer, count, &dwRead, NULL) &&

1 0

Mike McCormack : rpcrt4: Make RPCRT4_Send more compatible with write(2).
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 71fc596a058082c9480003cfde946d38e6e3f8b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71fc596a058082c9480003c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Apr 20 00:25:37 2006 +0900 rpcrt4: Make RPCRT4_Send more compatible with write(2). --- dlls/rpcrt4/rpc_message.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 7fe5e6a..6e89ace 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -238,6 +238,15 @@ VOID RPCRT4_FreeHeader(RpcPktHdr *Header HeapFree(GetProcessHeap(), 0, Header); } +static int rpcrt4_conn_write(RpcConnection *Connection, + const void *buffer, unsigned int count) +{ + DWORD dwWritten = 0; + if (!WriteFile(Connection->conn, buffer, count, &dwWritten, NULL)) + return -1; + return dwWritten; +} + /*********************************************************************** * RPCRT4_Send (internal) * @@ -247,7 +256,8 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co void *Buffer, unsigned int BufferLength) { PUCHAR buffer_pos; - DWORD hdr_size, count; + DWORD hdr_size; + LONG count; buffer_pos = Buffer; /* The packet building functions save the packet header size, so we can use it. */ @@ -264,9 +274,10 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co } /* transmit packet header */ - if (!WriteFile(Connection->conn, Header, hdr_size, &count, NULL)) { - WARN("WriteFile failed with error %ld\n", GetLastError()); - return GetLastError(); + count = rpcrt4_conn_write(Connection, Header, hdr_size); + if (count<0) { + WARN("rpcrt4_conn_write failed\n"); + return RPC_S_PROTOCOL_ERROR; } /* fragment consisted of header only and is the last one */ @@ -276,9 +287,10 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co } /* send the fragment data */ - if (!WriteFile(Connection->conn, buffer_pos, Header->common.frag_len - hdr_size, &count, NULL)) { - WARN("WriteFile failed with error %ld\n", GetLastError()); - return GetLastError(); + count = rpcrt4_conn_write(Connection, buffer_pos, Header->common.frag_len - hdr_size); + if (count<0) { + WARN("rpcrt4_conn_write failed\n"); + return RPC_S_PROTOCOL_ERROR; } buffer_pos += Header->common.frag_len - hdr_size;

1 0

Mike McCormack : rpcrt4: Make RPCRT4_Receive more compatible with read(2).
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 9a4abffa180e3fc2c8e08890f47443e1e014cbfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a4abffa180e3fc2c8e0889… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 20:57:00 2006 +0900 rpcrt4: Make RPCRT4_Receive more compatible with read(2). --- dlls/rpcrt4/rpc_message.c | 51 +++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index d47f9d9..7fe5e6a 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -290,6 +290,21 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co } /*********************************************************************** + * rpcrt4_conn_read (internal) + * + * Reads data from a connection + */ +static int rpcrt4_conn_read(RpcConnection *Connection, + void *buffer, unsigned int count) +{ + DWORD dwRead = 0; + if (!ReadFile(Connection->conn, buffer, count, &dwRead, NULL) && + (GetLastError() != ERROR_MORE_DATA)) + return -1; + return dwRead; +} + +/*********************************************************************** * RPCRT4_Receive (internal) * * Receive a packet from connection and merge the fragments. @@ -298,7 +313,8 @@ RPC_STATUS RPCRT4_Receive(RpcConnection PRPC_MESSAGE pMsg) { RPC_STATUS status; - DWORD dwRead, hdr_length; + DWORD hdr_length; + LONG dwRead; unsigned short first_flag; unsigned long data_length; unsigned long buffer_length; @@ -310,13 +326,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection TRACE("(%p, %p, %p)\n", Connection, Header, pMsg); /* read packet common header */ - if (!ReadFile(Connection->conn, &common_hdr, sizeof(common_hdr), &dwRead, NULL)) { - if (GetLastError() != ERROR_MORE_DATA) { - WARN("ReadFile failed with error %ld\n", GetLastError()); - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - } + dwRead = rpcrt4_conn_read(Connection, &common_hdr, sizeof(common_hdr)); if (dwRead != sizeof(common_hdr)) { WARN("Short read of header, %ld/%d bytes\n", dwRead, sizeof(common_hdr)); status = RPC_S_PROTOCOL_ERROR; @@ -342,14 +352,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection memcpy(*Header, &common_hdr, sizeof(common_hdr)); /* read the rest of packet header */ - if (!ReadFile(Connection->conn, &(*Header)->common + 1, - hdr_length - sizeof(common_hdr), &dwRead, NULL)) { - if (GetLastError() != ERROR_MORE_DATA) { - WARN("ReadFile failed with error %ld\n", GetLastError()); - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - } + dwRead = rpcrt4_conn_read(Connection, &(*Header)->common + 1, hdr_length - sizeof(common_hdr)); if (dwRead != hdr_length - sizeof(common_hdr)) { WARN("bad header length, %ld/%ld bytes\n", dwRead, hdr_length - sizeof(common_hdr)); status = RPC_S_PROTOCOL_ERROR; @@ -387,13 +390,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection } if (data_length == 0) dwRead = 0; else - if (!ReadFile(Connection->conn, buffer_ptr, data_length, &dwRead, NULL)) { - if (GetLastError() != ERROR_MORE_DATA) { - WARN("ReadFile failed with error %ld\n", GetLastError()); - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - } + dwRead = rpcrt4_conn_read(Connection, buffer_ptr, data_length); if (dwRead != data_length) { WARN("bad data length, %ld/%ld\n", dwRead, data_length); status = RPC_S_PROTOCOL_ERROR; @@ -413,13 +410,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection TRACE("next header\n"); /* read the header of next packet */ - if (!ReadFile(Connection->conn, *Header, hdr_length, &dwRead, NULL)) { - if (GetLastError() != ERROR_MORE_DATA) { - WARN("ReadFile failed with error %ld\n", GetLastError()); - status = GetLastError(); - goto fail; - } - } + dwRead = rpcrt4_conn_read(Connection, *Header, hdr_length); if (dwRead != hdr_length) { WARN("invalid packet header size (%ld)\n", dwRead); status = RPC_S_PROTOCOL_ERROR;

1 0

Mike McCormack : rpcrt4: Simplify RPCRT4_OpenConnection() a little.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: d571441562039307eb7ebd0b23d8ce74be7637f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d571441562039307eb7ebd0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 19:24:59 2006 +0900 rpcrt4: Simplify RPCRT4_OpenConnection() a little. --- dlls/rpcrt4/rpc_binding.c | 80 ++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 51 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index f2e0743..8c8d8c6 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -200,59 +200,37 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConn if (Connection->conn) return r; - if (Connection->server) { /* server */ - /* protseq=ncalrpc: supposed to use NT LPC ports, - * but we'll implement it with named pipes for now */ - if (strcmp(Connection->Protseq, "ncalrpc") == 0) { - static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; - LPSTR pname; - pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); - TRACE("listening on %s\n", pname); - r = rpcrt4_connect_pipe(Connection, pname); - HeapFree(GetProcessHeap(), 0, pname); - } - /* protseq=ncacn_np: named pipes */ - else if (strcmp(Connection->Protseq, "ncacn_np") == 0) { - static LPCSTR prefix = "\\\\."; - LPSTR pname; - pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); - r = rpcrt4_connect_pipe(Connection, pname); - HeapFree(GetProcessHeap(), 0, pname); - } - else { - ERR("protseq %s not supported\n", Connection->Protseq); - return RPC_S_PROTSEQ_NOT_SUPPORTED; - } + /* protseq=ncalrpc: supposed to use NT LPC ports, + * but we'll implement it with named pipes for now */ + if (strcmp(Connection->Protseq, "ncalrpc") == 0) { + static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; + LPSTR pname; + pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); + strcat(strcpy(pname, prefix), Connection->Endpoint); + + if (Connection->server) + r = rpcrt4_connect_pipe(Connection, pname); + else + r = rpcrt4_open_pipe(Connection, pname, TRUE); + HeapFree(GetProcessHeap(), 0, pname); } - else { /* client */ - /* protseq=ncalrpc: supposed to use NT LPC ports, - * but we'll implement it with named pipes for now */ - if (strcmp(Connection->Protseq, "ncalrpc") == 0) { - static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; - LPSTR pname; - - pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); - r = rpcrt4_open_pipe(Connection, pname, TRUE); - HeapFree(GetProcessHeap(), 0, pname); - } - /* protseq=ncacn_np: named pipes */ - else if (strcmp(Connection->Protseq, "ncacn_np") == 0) { - static LPCSTR prefix = "\\\\."; - LPSTR pname; - - pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); - r = rpcrt4_open_pipe(Connection, pname, FALSE); - HeapFree(GetProcessHeap(), 0, pname); - } else { - ERR("protseq %s not supported\n", Connection->Protseq); - return RPC_S_PROTSEQ_NOT_SUPPORTED; - } + /* protseq=ncacn_np: named pipes */ + else if (strcmp(Connection->Protseq, "ncacn_np") == 0) { + static LPCSTR prefix = "\\\\."; + LPSTR pname; + pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); + strcat(strcpy(pname, prefix), Connection->Endpoint); + if (Connection->server) + r = rpcrt4_connect_pipe(Connection, pname); + else + r = rpcrt4_open_pipe(Connection, pname, FALSE); + HeapFree(GetProcessHeap(), 0, pname); } - + else { + ERR("protseq %s not supported\n", Connection->Protseq); + r = RPC_S_PROTSEQ_NOT_SUPPORTED; + } + return r; }

1 0

Mike McCormack : rpcrt4: Split code to open a pipe from RPCRT4_OpenConnection.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: ae8197ef378adae1a9c095bbc8e257d3d688953d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae8197ef378adae1a9c095b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 19:07:09 2006 +0900 rpcrt4: Split code to open a pipe from RPCRT4_OpenConnection. --- dlls/rpcrt4/rpc_binding.c | 92 +++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 54 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index d5b1aef..f2e0743 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -154,6 +154,42 @@ static RPC_STATUS rpcrt4_connect_pipe(Rp return RPC_S_SERVER_UNAVAILABLE; } +static RPC_STATUS rpcrt4_open_pipe(RpcConnection *Connection, LPCSTR pname, BOOL wait) +{ + HANDLE conn; + DWORD err, dwMode; + + TRACE("connecting to %s\n", pname); + + while (TRUE) { + conn = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, 0); + if (conn != INVALID_HANDLE_VALUE) break; + err = GetLastError(); + if (err == ERROR_PIPE_BUSY) { + TRACE("connection failed, error=%lx\n", err); + return RPC_S_SERVER_TOO_BUSY; + } + if (!wait) + return RPC_S_SERVER_UNAVAILABLE; + if (!WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { + err = GetLastError(); + WARN("connection failed, error=%lx\n", err); + return RPC_S_SERVER_UNAVAILABLE; + } + } + + /* success */ + memset(&Connection->ovl, 0, sizeof(Connection->ovl)); + /* pipe is connected; change to message-read mode. */ + dwMode = PIPE_READMODE_MESSAGE; + SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + Connection->conn = conn; + + return RPC_S_OK; +} + RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection) { RPC_STATUS r = RPC_S_OK; @@ -196,73 +232,21 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConn if (strcmp(Connection->Protseq, "ncalrpc") == 0) { static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; LPSTR pname; - HANDLE conn; - DWORD err; - DWORD dwMode; pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); - TRACE("connecting to %s\n", pname); - while (TRUE) { - if (WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { - conn = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0); - if (conn != INVALID_HANDLE_VALUE) break; - err = GetLastError(); - if (err == ERROR_PIPE_BUSY) continue; - TRACE("connection failed, error=%lx\n", err); - HeapFree(GetProcessHeap(), 0, pname); - return RPC_S_SERVER_TOO_BUSY; - } else { - err = GetLastError(); - WARN("connection failed, error=%lx\n", err); - HeapFree(GetProcessHeap(), 0, pname); - return RPC_S_SERVER_UNAVAILABLE; - } - } - - /* success */ + r = rpcrt4_open_pipe(Connection, pname, TRUE); HeapFree(GetProcessHeap(), 0, pname); - memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - /* pipe is connected; change to message-read mode. */ - dwMode = PIPE_READMODE_MESSAGE; - SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); - Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - Connection->conn = conn; } /* protseq=ncacn_np: named pipes */ else if (strcmp(Connection->Protseq, "ncacn_np") == 0) { static LPCSTR prefix = "\\\\."; LPSTR pname; - HANDLE conn; - DWORD err; - DWORD dwMode; pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); - TRACE("connecting to %s\n", pname); - conn = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0); - if (conn == INVALID_HANDLE_VALUE) { - err = GetLastError(); - /* we don't need to handle ERROR_PIPE_BUSY here, - * the doc says that it is returned to the app */ - WARN("connection failed, error=%lx\n", err); - HeapFree(GetProcessHeap(), 0, pname); - if (err == ERROR_PIPE_BUSY) - return RPC_S_SERVER_TOO_BUSY; - else - return RPC_S_SERVER_UNAVAILABLE; - } - - /* success */ + r = rpcrt4_open_pipe(Connection, pname, FALSE); HeapFree(GetProcessHeap(), 0, pname); - memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - /* pipe is connected; change to message-read mode. */ - dwMode = PIPE_READMODE_MESSAGE; - SetNamedPipeHandleState(conn, &dwMode, NULL, NULL); - Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - Connection->conn = conn; } else { ERR("protseq %s not supported\n", Connection->Protseq); return RPC_S_PROTSEQ_NOT_SUPPORTED;

1 0

Mike McCormack : rpcrt4: Isolate code to open named pipes out of RPCRT4_OpenConnection.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 7e709cf25811427c11d024bbfcf6e48772526319 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e709cf25811427c11d024b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 18:14:30 2006 +0900 rpcrt4: Isolate code to open named pipes out of RPCRT4_OpenConnection. --- dlls/rpcrt4/rpc_binding.c | 76 +++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 37 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index a3b5fec..d5b1aef 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -129,11 +129,42 @@ RPC_STATUS RPCRT4_DestroyConnection(RpcC return RPC_S_OK; } +static RPC_STATUS rpcrt4_connect_pipe(RpcConnection *Connection, LPCSTR pname) +{ + TRACE("listening on %s\n", pname); + + Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, + PIPE_UNLIMITED_INSTANCES, + RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); + memset(&Connection->ovl, 0, sizeof(Connection->ovl)); + Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + if (ConnectNamedPipe(Connection->conn, &Connection->ovl)) + return RPC_S_OK; + + WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); + if (GetLastError() == ERROR_PIPE_CONNECTED) { + SetEvent(Connection->ovl.hEvent); + return RPC_S_OK; + } + if (GetLastError() == ERROR_IO_PENDING) { + /* FIXME: looks like we need to GetOverlappedResult here? */ + return RPC_S_OK; + } + return RPC_S_SERVER_UNAVAILABLE; +} + RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection) { + RPC_STATUS r = RPC_S_OK; + TRACE("(Connection == ^%p)\n", Connection); - if (!Connection->conn) { - if (Connection->server) { /* server */ + + /* already connected? */ + if (Connection->conn) + return r; + + if (Connection->server) { /* server */ /* protseq=ncalrpc: supposed to use NT LPC ports, * but we'll implement it with named pipes for now */ if (strcmp(Connection->Protseq, "ncalrpc") == 0) { @@ -142,22 +173,8 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConn pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); TRACE("listening on %s\n", pname); - Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); + r = rpcrt4_connect_pipe(Connection, pname); HeapFree(GetProcessHeap(), 0, pname); - memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { - WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); - if (GetLastError() == ERROR_PIPE_CONNECTED) { - SetEvent(Connection->ovl.hEvent); - return RPC_S_OK; - } else if (GetLastError() == ERROR_IO_PENDING) { - return RPC_S_OK; - } - return RPC_S_SERVER_UNAVAILABLE; - } } /* protseq=ncacn_np: named pipes */ else if (strcmp(Connection->Protseq, "ncacn_np") == 0) { @@ -165,30 +182,15 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConn LPSTR pname; pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); - TRACE("listening on %s\n", pname); - Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); + r = rpcrt4_connect_pipe(Connection, pname); HeapFree(GetProcessHeap(), 0, pname); - memset(&Connection->ovl, 0, sizeof(Connection->ovl)); - Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) { - if (GetLastError() == ERROR_PIPE_CONNECTED) { - SetEvent(Connection->ovl.hEvent); - return RPC_S_OK; - } else if (GetLastError() == ERROR_IO_PENDING) { - return RPC_S_OK; - } - WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError()); - return RPC_S_SERVER_UNAVAILABLE; - } } else { ERR("protseq %s not supported\n", Connection->Protseq); return RPC_S_PROTSEQ_NOT_SUPPORTED; } - } - else { /* client */ + } + else { /* client */ /* protseq=ncalrpc: supposed to use NT LPC ports, * but we'll implement it with named pipes for now */ if (strcmp(Connection->Protseq, "ncalrpc") == 0) { @@ -265,9 +267,9 @@ RPC_STATUS RPCRT4_OpenConnection(RpcConn ERR("protseq %s not supported\n", Connection->Protseq); return RPC_S_PROTSEQ_NOT_SUPPORTED; } - } } - return RPC_S_OK; + + return r; } RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection)

1 0

Alexandre Julliard : dbghelp: Don't fail to initialize if we can' t load the main module as ELF.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: ae5aacb4cc8f43d7cbe58fee3e8809110cf020c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae5aacb4cc8f43d7cbe58fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 19 14:30:10 2006 +0200 dbghelp: Don't fail to initialize if we can't load the main module as ELF. --- dlls/dbghelp/dbghelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index bd75a60..9dbb4dd 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -171,7 +171,8 @@ static BOOL check_live_target(struct pro { if (!GetProcessId(pcs->handle)) return FALSE; if (GetEnvironmentVariableA("DBGHELP_NOLIVE", NULL, 0)) return FALSE; - return elf_read_wine_loader_dbg_info(pcs); + elf_read_wine_loader_dbg_info(pcs); + return TRUE; } /******************************************************************

1 0

Alexandre Julliard : shell32: Fixed ordinals of SHDefExtractIconA/W.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 9686acb46c40a5e1c158a91caedc941807b63a19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9686acb46c40a5e1c158a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 19 14:24:17 2006 +0200 shell32: Fixed ordinals of SHDefExtractIconA/W. --- dlls/shell32/shell32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index a3de716..83f6df6 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -4,8 +4,10 @@ # win95 and winNT dlls import shell32.d # This list was updated to dll version 4.72 2 stdcall -noname SHChangeNotifyRegister(long long long long long ptr) + 3 stdcall SHDefExtractIconA(str long long ptr ptr long) 4 stdcall -noname SHChangeNotifyDeregister(long) 5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) + 6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) 9 stub -noname PifMgr_OpenProperties 10 stub -noname PifMgr_GetProperties 11 stub -noname PifMgr_SetProperties @@ -319,8 +321,6 @@ #300 stub Shl3216_ThunkData32 @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stub SHCreateProcessAsUserW -@ stdcall SHDefExtractIconA(str long long ptr ptr long) -@ stdcall SHDefExtractIconW(wstr long long ptr ptr long) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) @ stub SHExtractIconsW

1 0

Michael Kaufmann : user: Find popup menus by ID.
by Alexandre Julliard 19 Apr '06

19 Apr '06

Module: wine Branch: refs/heads/master Commit: 01bf37d81016486af4bd46e4c1c712bd8eac154f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01bf37d81016486af4bd46e… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Apr 18 16:35:51 2006 +0200 user: Find popup menus by ID. - Find menus by ID: Proper fallback to popup menus. - Use the menu ID, not the handle for the fallback. - Save the fallback menu's position. --- dlls/user/menu.c | 13 ++++++++-- dlls/user/tests/menu.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a487347..11a02d8 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -580,6 +580,7 @@ static MENUITEM *MENU_FindItem( HMENU *h { POPUPMENU *menu; MENUITEM *fallback = NULL; + UINT fallback_pos = 0; UINT i; if ((*hmenu == (HMENU)0xffff) || (!(menu = MENU_GetMenu(*hmenu)))) return NULL; @@ -602,8 +603,12 @@ static MENUITEM *MENU_FindItem( HMENU *h *hmenu = hsubmenu; return subitem; } - if ((UINT_PTR)item->hSubMenu == *nPos) - fallback = item; /* fallback to this item if nothing else found */ + else if (item->wID == *nPos) + { + /* fallback to this item if nothing else found */ + fallback_pos = i; + fallback = item; + } } else if (item->wID == *nPos) { @@ -612,6 +617,10 @@ static MENUITEM *MENU_FindItem( HMENU *h } } } + + if (fallback) + *nPos = fallback_pos; + return fallback; } diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 22e48bf..c2fd8f3 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -1410,6 +1410,69 @@ void test_menu_search_bycommand( void ) ok (rc, "Getting the menus info failed\n"); ok (info.wID == (UINT)hmenuSub2, "IDs differ for popup menu\n"); ok (!strcmp(info.dwTypeData, "Submenu2"), "Returned item has wrong label (%s)\n", info.dwTypeData); + + DestroyMenu( hmenu ); + DestroyMenu( hmenuSub ); + DestroyMenu( hmenuSub2 ); + + + /* + Case 5: Menu containing a popup menu which in turn + contains an item with a different id than the popup menu. + This tests the fallback to a popup menu ID. + */ + + hmenu = CreateMenu(); + hmenuSub = CreateMenu(); + + rc = AppendMenu(hmenu, MF_POPUP | MF_STRING, (UINT_PTR)hmenuSub, "Submenu"); + ok (rc, "Appending the popup menu to the main menu failed\n"); + + rc = AppendMenu(hmenuSub, MF_STRING, 102, "Item"); + ok (rc, "Appending the item to the popup menu failed\n"); + + /* Set the ID for hmenuSub */ + info.cbSize = sizeof(info); + info.fMask = MIIM_ID; + info.wID = 101; + + rc = SetMenuItemInfo(hmenu, 0, TRUE, &info); + ok(rc, "Setting the ID for the popup menu failed\n"); + + /* Check if the ID has been set */ + info.wID = 0; + rc = GetMenuItemInfo(hmenu, 0, TRUE, &info); + ok(rc, "Getting the ID for the popup menu failed\n"); + ok(info.wID == 101, "The ID for the popup menu has not been set\n"); + + /* Prove getting the item info via ID returns the popup menu */ + memset( &info, 0, sizeof(info)); + strback[0] = 0x00; + info.cbSize = sizeof(MENUITEMINFO); + info.fMask = MIIM_STRING | MIIM_ID; + info.dwTypeData = strback; + info.cch = sizeof(strback); + + rc = GetMenuItemInfo(hmenu, 101, FALSE, &info); + ok (rc, "Getting the menu info failed\n"); + ok (info.wID == 101, "IDs differ\n"); + ok (!strcmp(info.dwTypeData, "Submenu"), "Returned item has wrong label (%s)\n", info.dwTypeData); + + /* Also look for the menu item */ + memset( &info, 0, sizeof(info)); + strback[0] = 0x00; + info.cbSize = sizeof(MENUITEMINFO); + info.fMask = MIIM_STRING | MIIM_ID; + info.dwTypeData = strback; + info.cch = sizeof(strback); + + rc = GetMenuItemInfo(hmenu, 102, FALSE, &info); + ok (rc, "Getting the menu info failed\n"); + ok (info.wID == 102, "IDs differ\n"); + ok (!strcmp(info.dwTypeData, "Item"), "Returned item has wrong label (%s)\n", info.dwTypeData); + + DestroyMenu(hmenu); + DestroyMenu(hmenuSub); } START_TEST(menu)

1 0