January 2008 - Wine-Commits

Rob Shearman : rpcrt4: Bind to the server interface in I_RpcGetBuffer, not I_RpcSendReceive.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: d0f914befce1e3180f4f8712db3952248afad543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f914befce1e3180f4f8712d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 12:26:19 2008 +0000 rpcrt4: Bind to the server interface in I_RpcGetBuffer, not I_RpcSendReceive. The actual sending of the request is still done in I_RpcSendReceive though. Disallow the server from calling I_RpcSend and I_RpcReceive to allow simplification of the code. The releasing of the connection is now done in I_RpcFreeBuffer. Implement I_RpcNegotiateTransferSyntax. --- dlls/rpcrt4/rpc_assoc.c | 2 +- dlls/rpcrt4/rpc_message.c | 165 ++++++++++++++++++++++++++------------------- dlls/rpcrt4/rpc_server.c | 4 +- 3 files changed, 98 insertions(+), 73 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 1bffb85..6075278 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -332,7 +332,7 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * break; } - I_RpcFreeBuffer(&msg); + I_RpcFree(msg.Buffer); RPCRT4_FreeHeader(response_hdr); return status; } diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index bbcc798..9246afd 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -754,8 +754,12 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, TRACE("buffer length = %u\n", pMsg->BufferLength); - status = I_RpcGetBuffer(pMsg); - if (status != RPC_S_OK) goto fail; + pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); + if (!pMsg->Buffer) + { + status = ERROR_OUTOFMEMORY; + goto fail; + } first_flag = RPC_FLG_FIRST; auth_length = common_hdr.auth_len; @@ -891,6 +895,54 @@ fail: } /*********************************************************************** + * I_RpcNegotiateTransferSyntax [RPCRT4.@] + * + * Negotiates the transfer syntax used by a client connection by connecting + * to the server. + * + * PARAMS + * pMsg [I] RPC Message structure. + * pAsync [I] Asynchronous state to set. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) +{ + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + RpcConnection* conn; + RPC_STATUS status = RPC_S_OK; + + TRACE("(%p)\n", pMsg); + + if (!bind || bind->server) + return RPC_S_INVALID_BINDING; + + /* if we already have a connection, we don't need to negotiate again */ + if (!pMsg->ReservedForRuntime) + { + RPC_CLIENT_INTERFACE *cif = pMsg->RpcInterfaceInformation; + if (!cif) return RPC_S_INTERFACE_NOT_FOUND; + + if (!bind->Endpoint || !bind->Endpoint[0]) + { + TRACE("automatically resolving partially bound binding\n"); + status = RpcEpResolveBinding(bind, cif); + if (status != RPC_S_OK) return status; + } + + status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, + &cif->InterfaceId); + + if (status == RPC_S_OK) + pMsg->ReservedForRuntime = conn; + } + + return status; +} + +/*********************************************************************** * I_RpcGetBuffer [RPCRT4.@] * * Allocates a buffer for use by I_RpcSend or I_RpcSendReceive and binds to the @@ -916,11 +968,30 @@ fail: */ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) { + RPC_STATUS status; + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); - pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); + if (!bind) + return RPC_S_INVALID_BINDING; + + pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); - return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; + + if (!pMsg->Buffer) + return ERROR_OUTOFMEMORY; + + if (!bind->server) + { + status = I_RpcNegotiateTransferSyntax(pMsg); + if (status != RPC_S_OK) + I_RpcFree(pMsg->Buffer); + } + else + status = RPC_S_OK; + + return status; } /*********************************************************************** @@ -952,8 +1023,19 @@ static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) */ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); + + if (!bind) return RPC_S_INVALID_BINDING; + + if (pMsg->ReservedForRuntime) + { + RpcConnection *conn = pMsg->ReservedForRuntime; + RPCRT4_CloseBinding(bind, conn); + pMsg->ReservedForRuntime = NULL; + } + I_RpcFree(pMsg->Buffer); return RPC_S_OK; } @@ -978,44 +1060,26 @@ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; - RPC_CLIENT_INTERFACE* cif = NULL; RPC_STATUS status; RpcPktHdr *hdr; TRACE("(%p)\n", pMsg); - if (!bind || bind->server) return RPC_S_INVALID_BINDING; - - cif = pMsg->RpcInterfaceInformation; - if (!cif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - - if (!bind->Endpoint || !bind->Endpoint[0]) - { - TRACE("automatically resolving partially bound binding\n"); - status = RpcEpResolveBinding(bind, cif); - if (status != RPC_S_OK) return status; - } + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; - status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); - if (status != RPC_S_OK) return status; + conn = pMsg->ReservedForRuntime; hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, pMsg->BufferLength, pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, &bind->ObjectUuid); if (!hdr) - { - RPCRT4_CloseBinding(bind, conn); return ERROR_OUTOFMEMORY; - } hdr->common.call_id = conn->NextCallId++; status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); RPCRT4_FreeHeader(hdr); - /* save the connection, so the response can be read from it */ - pMsg->ReservedForRuntime = conn; return status; } @@ -1043,41 +1107,14 @@ static inline BOOL is_hard_error(RPC_STATUS status) RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; - RpcConnection* conn; - RPC_CLIENT_INTERFACE* cif = NULL; - RPC_SERVER_INTERFACE* sif = NULL; RPC_STATUS status; RpcPktHdr *hdr = NULL; + RpcConnection *conn; TRACE("(%p)\n", pMsg); - if (!bind) return RPC_S_INVALID_BINDING; - - if (pMsg->ReservedForRuntime) { - conn = pMsg->ReservedForRuntime; - pMsg->ReservedForRuntime = NULL; - } else { - if (bind->server) { - sif = pMsg->RpcInterfaceInformation; - if (!sif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - status = RPCRT4_OpenBinding(bind, &conn, &sif->TransferSyntax, - &sif->InterfaceId); - } else { - cif = pMsg->RpcInterfaceInformation; - if (!cif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - - if (!bind->Endpoint || !bind->Endpoint[0]) - { - TRACE("automatically resolving partially bound binding\n"); - status = RpcEpResolveBinding(bind, cif); - if (status != RPC_S_OK) return status; - } - - status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); - } - if (status != RPC_S_OK) return status; - } + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; + conn = pMsg->ReservedForRuntime; status = RPCRT4_Receive(conn, &hdr, pMsg); if (status != RPC_S_OK) { WARN("receive failed with error %lx\n", status); @@ -1086,16 +1123,6 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) switch (hdr->common.ptype) { case PKT_RESPONSE: - if (bind->server) { - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - break; - case PKT_REQUEST: - if (!bind->server) { - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } break; case PKT_FAULT: ERR ("we got fault packet with status 0x%lx\n", hdr->fault.status); @@ -1110,13 +1137,13 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) } /* success */ - RPCRT4_CloseBinding(bind, conn); RPCRT4_FreeHeader(hdr); return status; fail: RPCRT4_FreeHeader(hdr); RPCRT4_DestroyConnection(conn); + pMsg->ReservedForRuntime = NULL; return status; } @@ -1141,17 +1168,17 @@ fail: RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) { RPC_STATUS status; - RPC_MESSAGE original_message; + void *original_buffer; TRACE("(%p)\n", pMsg); - original_message = *pMsg; + original_buffer = pMsg->Buffer; status = I_RpcSend(pMsg); if (status == RPC_S_OK) status = I_RpcReceive(pMsg); /* free the buffer replaced by a new buffer in I_RpcReceive */ if (status == RPC_S_OK) - I_RpcFreeBuffer(&original_message); + I_RpcFree(original_buffer); return status; } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 3db7365..fcac3dd 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -335,10 +335,8 @@ fail: /* clean up */ if (msg->Buffer == buf) msg->Buffer = NULL; TRACE("freeing Buffer=%p\n", buf); - HeapFree(GetProcessHeap(), 0, buf); - msg->Handle = 0; + I_RpcFree(buf); I_RpcFreeBuffer(msg); - msg->Buffer = NULL; RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); }

1 0

Rob Shearman : rpcrt4: Remove some unused includes.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: bb78c3f86d9266cb79037275012dc1ea14478b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb78c3f86d9266cb790372750… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 12:03:06 2008 +0000 rpcrt4: Remove some unused includes. --- dlls/rpcrt4/ndr_clientserver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index fc44ef7..58d21c6 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -23,9 +23,6 @@ */ #include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <assert.h> #define COBJMACROS

1 0

Rob Shearman : rpcrt4: Set the fBufferValid flag in NdrProxyGetBuffer.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 9ff15252d09066f8e9144016391b8de8a4343008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff15252d09066f8e91440163… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 12:02:55 2008 +0000 rpcrt4: Set the fBufferValid flag in NdrProxyGetBuffer. Only call IRpcChannelBuffer_FreeBuffer in NdrProxyFreeBuffer if fBufferValid is set. --- dlls/rpcrt4/cproxy.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6580bcf..084285a 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -364,6 +364,7 @@ void WINAPI NdrProxyGetBuffer(void *This, RpcRaiseException(hr); return; } + pStubMsg->fBufferValid = TRUE; pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; pStubMsg->Buffer = pStubMsg->BufferStart; @@ -408,11 +409,14 @@ void WINAPI NdrProxySendReceive(void *This, void WINAPI NdrProxyFreeBuffer(void *This, PMIDL_STUB_MESSAGE pStubMsg) { - HRESULT hr; - TRACE("(%p,%p)\n", This, pStubMsg); - hr = IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, - (RPCOLEMESSAGE*)pStubMsg->RpcMsg); + + if (pStubMsg->fBufferValid) + { + IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, + (RPCOLEMESSAGE*)pStubMsg->RpcMsg); + pStubMsg->fBufferValid = TRUE; + } } /***********************************************************************

1 0

Alexander Nicolaysen Sørnes : crypt32: Implement CryptFindLocalizedName.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: a3a165fcdb3dbab228c5118aef675aa0a86448a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a165fcdb3dbab228c5118ae… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 6 17:02:33 2008 +0100 crypt32: Implement CryptFindLocalizedName. --- dlls/crypt32/crypt32_En.rc | 8 ++++++++ dlls/crypt32/crypt32_No.rc | 8 ++++++++ dlls/crypt32/cryptres.h | 5 +++++ dlls/crypt32/oid.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 08bf385..38e3b2e 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -164,3 +164,11 @@ STRINGTABLE DISCARDABLE IDS_LIFETIME_SIGNING "Lifetime Signing" IDS_ANY_CERT_POLICY "All issuance policies" } + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALIZEDNAME_ROOT "Trusted Root Certification Authorities" + IDS_LOCALIZEDNAME_MY "Personal" + IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" +} diff --git a/dlls/crypt32/crypt32_No.rc b/dlls/crypt32/crypt32_No.rc index 6d5bb82..18de84b 100644 --- a/dlls/crypt32/crypt32_No.rc +++ b/dlls/crypt32/crypt32_No.rc @@ -164,3 +164,11 @@ STRINGTABLE DISCARDABLE IDS_LIFETIME_SIGNING "Livstidsignering" IDS_ANY_CERT_POLICY "Alle framgangsm�ter for utsteding" } + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALIZEDNAME_ROOT "Klarerte rotsertifiseringsinstanser" + IDS_LOCALIZEDNAME_MY "Personlig" + IDS_LOCALIZEDNAME_CA "Mellomliggende sertifiseringsinstanser" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Andre personer" +} diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 1f0a95e..32c8169 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -160,4 +160,9 @@ #define IDS_LIFETIME_SIGNING 1139 #define IDS_ANY_CERT_POLICY 1140 +#define IDS_LOCALIZEDNAME_ROOT 1141 +#define IDS_LOCALIZEDNAME_MY 1142 +#define IDS_LOCALIZEDNAME_CA 1143 +#define IDS_LOCALIZEDNAME_ADDRESSBOOK 1144 + #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index c35554f..5d17997 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -77,6 +77,13 @@ struct OIDFunction struct list next; }; +static const WCHAR ROOT[] = {'R','O','O','T',0}; +static const WCHAR MY[] = {'M','Y',0}; +static const WCHAR CA[] = {'C','A',0}; +static const WCHAR ADDRESSBOOK[] = {'A','D','D','R','E','S','S','B','O','O','K',0}; +static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK}; +static WCHAR LocalizedNames[4][256]; + static void free_function_sets(void) { struct OIDFunctionSet *setCursor, *setNext; @@ -987,12 +994,32 @@ BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, return ret; } +static void oid_init_localizednames(HINSTANCE hInstance) +{ + int i; + + for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++) + { + LoadStringW(hInstance, IDS_LOCALIZEDNAME_ROOT+i, LocalizedNames[i], 256); + } +} + /******************************************************************** * CryptFindLocalizedName (CRYPT32.@) */ LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName) { - FIXME(" %s - stub\n",debugstr_w(pwszCryptName)); + int i; + + for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++) + { + if(!lstrcmpiW(LocalizedKeys[i], pwszCryptName)) + { + return LocalizedNames[i]; + } + } + + FIXME("No name for: %s - stub\n",debugstr_w(pwszCryptName)); return NULL; } @@ -1345,6 +1372,7 @@ static void init_oid_info(HINSTANCE hinst) { DWORD i; + oid_init_localizednames(hinst); for (i = 0; i < sizeof(oidInfoConstructors) / sizeof(oidInfoConstructors[0]); i++) {

1 0

Jonathan Ernst : crypt32: Updated French translation.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 779d4c74e15e0406d900aa77933ff76b9681ffbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=779d4c74e15e0406d900aa779… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jan 7 09:21:29 2008 +0100 crypt32: Updated French translation. --- dlls/crypt32/crypt32_Fr.rc | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index f77a77d..06a11f9 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -1,7 +1,7 @@ /* * crypt32 dll French resources * - * Copyright 2006 Jonathan Ernst + * Copyright 2006-2008 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,13 +22,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_AUTHORITY_KEY_ID "Authority Key Identifier" - IDS_KEY_ATTRIBUTES "Key Attributes" - IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction" + IDS_AUTHORITY_KEY_ID "Identifiant de l'authorit� de la cl�" + IDS_KEY_ATTRIBUTES "Attributs de la cl�" + IDS_KEY_USAGE_RESTRICTION "Restrictions de l'utilisation de la cl�" IDS_SUBJECT_ALT_NAME "Subject Alternative Name" IDS_ISSUER_ALT_NAME "Issuer Alternative Name" IDS_BASIC_CONSTRAINTS "Basic Constraints" - IDS_KEY_USAGE "Key Usage" + IDS_KEY_USAGE "Utilisation de la cl�" IDS_CERT_POLICIES "Certificate Policies" IDS_SUBJECT_KEY_IDENTIFIER "Subject Key Identifier" IDS_CRL_REASON_CODE "CRL Reason Code" @@ -49,7 +49,7 @@ STRINGTABLE DISCARDABLE IDS_SMIME_CAPABILITIES "SMIME Capabilities" IDS_PREFER_SIGNED_DATA "Prefer Signed Data" IDS_CPS "CPS" - IDS_USER_NOTICE "User Notice" + IDS_USER_NOTICE "Notice utilisateur" IDS_OCSP "On-line Certificate Status Protocol" IDS_CA_ISSUER "Certification Authority Issuer" IDS_CERT_TEMPLATE_NAME "Certification Template Name" @@ -157,10 +157,18 @@ STRINGTABLE DISCARDABLE IDS_DOCUMENT_SIGNING "Signature de document" IDS_IPSEC_IKE_INTERMEDIATE "IP security IKE intermediate" IDS_FILE_RECOVERY "R�cup�ration de fichier" - IDS_ROOT_LIST_SIGNER "Root List Signer" + IDS_ROOT_LIST_SIGNER "Signataires de la liste racine" IDS_ANY_APPLICATION_POLICIES "All application policies" IDS_DS_EMAIL_REPLICATION "Directory Service Email Replication" IDS_ENROLLMENT_AGENT "Certificate Request Agent" IDS_LIFETIME_SIGNING "Lifetime Signing" IDS_ANY_CERT_POLICY "All issuance policies" } + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALIZEDNAME_ROOT "Autorit�s de certification de confiance" + IDS_LOCALIZEDNAME_MY "Personnel" + IDS_LOCALIZEDNAME_CA "Autorit�s interm�diaires" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" +}

1 0

Gerald Pfeifer : user32: Factor in EDIT_WM_EraseBkGnd().
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 29b8c35bbf5cf0d316747da036abc4062b1c073c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b8c35bbf5cf0d316747da03… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jan 7 15:11:09 2008 +0100 user32: Factor in EDIT_WM_EraseBkGnd(). --- dlls/user32/edit.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index d7c6499..7f9f24e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -263,7 +263,6 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_Copy(EDITSTATE *es); static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name); static LRESULT EDIT_WM_Destroy(EDITSTATE *es); -static LRESULT EDIT_WM_EraseBkGnd(EDITSTATE *es, HDC dc); static INT EDIT_WM_GetText(const EDITSTATE *es, INT count, LPWSTR dst, BOOL unicode); static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos); static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key); @@ -893,7 +892,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, break; case WM_ERASEBKGND: - result = EDIT_WM_EraseBkGnd(es, (HDC)wParam); + /* we do the proper erase in EDIT_WM_Paint */ + result = 1; break; case WM_GETFONT: @@ -4260,18 +4260,6 @@ static LRESULT EDIT_WM_Destroy(EDITSTATE *es) /********************************************************************* * - * WM_ERASEBKGND - * - */ -static LRESULT EDIT_WM_EraseBkGnd(EDITSTATE *es, HDC dc) -{ - /* we do the proper erase in EDIT_WM_Paint */ - return 1; -} - - -/********************************************************************* - * * WM_GETTEXT * */

1 0

Rob Shearman : include: Add prototype for I_RpcNegotiateTransferSyntax.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 974b4d2c955b7623ecbb35aeb5a0119002f8b9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974b4d2c955b7623ecbb35aeb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 8 12:02:49 2008 +0000 include: Add prototype for I_RpcNegotiateTransferSyntax. --- include/rpcdcep.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/rpcdcep.h b/include/rpcdcep.h index f0b78c1..f511bb0 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -130,6 +130,8 @@ typedef struct _RPC_CLIENT_INTERFACE #define TRANSPORT_TYPE_WMSG 0x08 RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcNegotiateTransferSyntax( RPC_MESSAGE* Message ); +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcGetBuffer( RPC_MESSAGE* Message ); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcGetBufferWithObject( RPC_MESSAGE* Message, UUID* ObjectUuid );

1 0

Hans Leidekker : msvcrt: Implement _wexecv{, e, p, pe}.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 8d768b7713c69d0091138984800431b84f0afaf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d768b7713c69d00911389848… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 7 14:23:46 2008 +0100 msvcrt: Implement _wexecv{, e, p, pe}. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/process.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index bc94284..951f7ad 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -634,6 +634,8 @@ int MSVCRT__write(int,const void*,unsigned int); int _getch(void); int _ismbstrail(const unsigned char* start, const unsigned char* str); MSVCRT_intptr_t _spawnve(int,const char*,const char* const *,const char* const *); +MSVCRT_intptr_t _wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *); +MSVCRT_intptr_t _wspawnvpe(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *); void _searchenv(const char*,const char*,char*); int _getdrive(void); char* _strdup(const char*); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c4113aa..0877366 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -522,10 +522,10 @@ @ varargs _wexecle(wstr wstr) @ varargs _wexeclp(wstr wstr) @ varargs _wexeclpe(wstr wstr) -@ stub _wexecv #(wstr ptr) -@ stub _wexecve #(wstr ptr ptr) -@ stub _wexecvp #(wstr ptr) -@ stub _wexecvpe #(wstr ptr ptr) +@ cdecl _wexecv(wstr ptr) +@ cdecl _wexecve(wstr ptr ptr) +@ cdecl _wexecvp(wstr ptr) +@ cdecl _wexecvpe(wstr ptr ptr) @ cdecl _wfdopen(long wstr) MSVCRT__wfdopen @ cdecl _wfindfirst(wstr ptr) MSVCRT__wfindfirst @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index d764eaf..9be2b94 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -542,6 +542,16 @@ MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...) } /********************************************************************* + * _wexecv (MSVCRT.@) + * + * Unicode version of _execv + */ +MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv) +{ + return _wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, NULL); +} + +/********************************************************************* * _execv (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -553,6 +563,16 @@ MSVCRT_intptr_t CDECL _execv(const char* name, char* const* argv) } /********************************************************************* + * _wexecve (MSVCRT.@) + * + * Unicode version of _execve + */ +MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) +{ + return _wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv); +} + +/********************************************************************* * _execve (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -564,6 +584,21 @@ MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const } /********************************************************************* + * _wexecvpe (MSVCRT.@) + * + * Unicode version of _execvpe + */ +MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) +{ + static const MSVCRT_wchar_t path[] = {'P','A','T','H',0}; + MSVCRT_wchar_t fullname[MAX_PATH]; + + _wsearchenv(name, path, fullname); + return _wspawnvpe(MSVCRT__P_OVERLAY, fullname[0] ? fullname : name, + (const MSVCRT_wchar_t* const*) argv, envv); +} + +/********************************************************************* * _execvpe (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -579,6 +614,16 @@ MSVCRT_intptr_t CDECL _execvpe(const char* name, char* const* argv, const char* } /********************************************************************* + * _wexecvp (MSVCRT.@) + * + * Unicode version of _execvp + */ +MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv) +{ + return _wexecvpe(name, argv, NULL); +} + +/********************************************************************* * _execvp (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces

1 0

Hans Leidekker : msvcrt: Rewrite _spawnve as a wrapper.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 516b4ebd0eaef17fc0be24eae46ba512226cf810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516b4ebd0eaef17fc0be24eae… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 7 14:23:08 2008 +0100 msvcrt: Rewrite _spawnve as a wrapper. --- dlls/msvcrt/process.c | 169 +++++++------------------------------------------ 1 files changed, 23 insertions(+), 146 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index d2df7fa..7835d88 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -35,54 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/* INTERNAL: Spawn a child process */ -static MSVCRT_intptr_t msvcrt_spawn(int flags, const char* exe, char* cmdline, char* env) -{ - STARTUPINFOA si; - PROCESS_INFORMATION pi; - - if ((unsigned)flags > MSVCRT__P_DETACH) - { - *MSVCRT__errno() = MSVCRT_EINVAL; - return -1; - } - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); - if (!CreateProcessA(exe, cmdline, NULL, NULL, TRUE, - flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, - env, NULL, &si, &pi)) - { - msvcrt_set_errno(GetLastError()); - MSVCRT_free(si.lpReserved2); - return -1; - } - - MSVCRT_free(si.lpReserved2); - switch(flags) - { - case MSVCRT__P_WAIT: - WaitForSingleObject(pi.hProcess, INFINITE); - GetExitCodeProcess(pi.hProcess,&pi.dwProcessId); - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return pi.dwProcessId; - case MSVCRT__P_DETACH: - CloseHandle(pi.hProcess); - pi.hProcess = 0; - /* fall through */ - case MSVCRT__P_NOWAIT: - case MSVCRT__P_NOWAITO: - CloseHandle(pi.hThread); - return (MSVCRT_intptr_t)pi.hProcess; - case MSVCRT__P_OVERLAY: - MSVCRT__exit(0); - } - return -1; /* can't reach here */ -} - -static MSVCRT_intptr_t msvcrt_spawn_wide(int flags, const MSVCRT_wchar_t* exe, MSVCRT_wchar_t* cmdline, MSVCRT_wchar_t* env) +static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT_wchar_t* cmdline, MSVCRT_wchar_t* env) { STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -128,52 +81,7 @@ static MSVCRT_intptr_t msvcrt_spawn_wide(int flags, const MSVCRT_wchar_t* exe, M return -1; /* can't reach here */ } -/* INTERNAL: Convert argv list to a single 'delim'-separated string, with an - * extra '\0' to terminate it - */ -static char* msvcrt_argvtos(const char* const* arg, char delim) -{ - const char* const* a; - long size; - char* p; - char* ret; - - if (!arg && !delim) - { - /* Return NULL for an empty environment list */ - return NULL; - } - - /* get length */ - a = arg; - size = 0; - while (*a) - { - size += strlen(*a) + 1; - a++; - } - - ret = MSVCRT_malloc(size + 1); - if (!ret) - return NULL; - - /* fill string */ - a = arg; - p = ret; - while (*a) - { - int len = strlen(*a); - memcpy(p,*a,len); - p += len; - *p++ = delim; - a++; - } - if (delim && p > ret) p[-1] = 0; - else *p = 0; - return ret; -} - -static MSVCRT_wchar_t* msvcrt_argvtos_wide(const MSVCRT_wchar_t* const* arg, MSVCRT_wchar_t delim) +static MSVCRT_wchar_t* msvcrt_argvtos(const MSVCRT_wchar_t* const* arg, MSVCRT_wchar_t delim) { const MSVCRT_wchar_t* const* a; long size; @@ -375,7 +283,7 @@ MSVCRT_intptr_t CDECL _execl(const char* name, const char* arg0, ...) args = msvcrt_valisttos_aw(arg0, ap, ' '); va_end(ap); - ret = msvcrt_spawn_wide(MSVCRT__P_OVERLAY, nameW, args, NULL); + ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, NULL); MSVCRT_free(nameW); MSVCRT_free(args); @@ -404,7 +312,7 @@ MSVCRT_intptr_t CDECL _execle(const char* name, const char* arg0, ...) if (envp) envs = msvcrt_argvtos_aw(envp, 0); va_end(ap); - ret = msvcrt_spawn_wide(MSVCRT__P_OVERLAY, nameW, args, envs); + ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, envs); MSVCRT_free(nameW); MSVCRT_free(args); @@ -432,7 +340,7 @@ MSVCRT_intptr_t CDECL _execlp(const char* name, const char* arg0, ...) args = msvcrt_valisttos_aw(arg0, ap, ' '); va_end(ap); - ret = msvcrt_spawn_wide(MSVCRT__P_OVERLAY, fullname[0] ? fullname : nameW, args, NULL); + ret = msvcrt_spawn(MSVCRT__P_OVERLAY, fullname[0] ? fullname : nameW, args, NULL); MSVCRT_free(nameW); MSVCRT_free(args); @@ -463,7 +371,7 @@ MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...) if (envp) envs = msvcrt_argvtos_aw(envp, 0); va_end(ap); - ret = msvcrt_spawn_wide(MSVCRT__P_OVERLAY, fullname[0] ? fullname : nameW, args, envs); + ret = msvcrt_spawn(MSVCRT__P_OVERLAY, fullname[0] ? fullname : nameW, args, envs); MSVCRT_free(nameW); MSVCRT_free(args); @@ -537,7 +445,7 @@ MSVCRT_intptr_t CDECL _spawnl(int flags, const char* name, const char* arg0, ... args = msvcrt_valisttos_aw(arg0, ap, ' '); va_end(ap); - ret = msvcrt_spawn_wide(flags, nameW, args, NULL); + ret = msvcrt_spawn(flags, nameW, args, NULL); MSVCRT_free(nameW); MSVCRT_free(args); @@ -566,7 +474,7 @@ MSVCRT_intptr_t CDECL _spawnle(int flags, const char* name, const char* arg0, .. if (envp) envs = msvcrt_argvtos_aw(envp, 0); va_end(ap); - ret = msvcrt_spawn_wide(flags, nameW, args, envs); + ret = msvcrt_spawn(flags, nameW, args, envs); MSVCRT_free(nameW); MSVCRT_free(args); @@ -595,7 +503,7 @@ MSVCRT_intptr_t CDECL _spawnlp(int flags, const char* name, const char* arg0, .. args = msvcrt_valisttos_aw(arg0, ap, ' '); va_end(ap); - ret = msvcrt_spawn_wide(flags, fullname[0] ? fullname : nameW, args, NULL); + ret = msvcrt_spawn(flags, fullname[0] ? fullname : nameW, args, NULL); MSVCRT_free(nameW); MSVCRT_free(args); @@ -626,7 +534,7 @@ MSVCRT_intptr_t CDECL _spawnlpe(int flags, const char* name, const char* arg0, . if (envp) envs = msvcrt_argvtos_aw(envp, 0); va_end(ap); - ret = msvcrt_spawn_wide(flags, fullname[0] ? fullname : nameW, args, envs); + ret = msvcrt_spawn(flags, fullname[0] ? fullname : nameW, args, envs); MSVCRT_free(nameW); MSVCRT_free(args); @@ -643,50 +551,19 @@ MSVCRT_intptr_t CDECL _spawnlpe(int flags, const char* name, const char* arg0, . MSVCRT_intptr_t CDECL _spawnve(int flags, const char* name, const char* const* argv, const char* const* envv) { - char * args = msvcrt_argvtos(argv,' '); - char * envs = msvcrt_argvtos(envv,0); - char fullname[MAX_PATH]; - const char *p; - int len; - MSVCRT_intptr_t ret = -1; - - TRACE(":call (%s), params (%s), env (%s)\n",debugstr_a(name),debugstr_a(args), - envs?"Custom":"Null"); - - /* no check for NULL name. - native doesn't do it */ - - p = memchr(name, '\0', MAX_PATH); - if( !p ) - p = name + MAX_PATH - 1; - len = p - name; - - /* extra-long names are silently truncated. */ - memcpy(fullname, name, len); + MSVCRT_wchar_t *nameW, *args, *envs; + MSVCRT_intptr_t ret; - for( p--; p >= name; p-- ) - { - if( *p == '\\' || *p == '/' || *p == ':' || *p == '.' ) - break; - } + if (!(nameW = msvcrt_wstrdupa(name))) return -1; - /* if no extension is given, assume .exe */ - if( (p < name || *p != '.') && len <= MAX_PATH - 5 ) - { - FIXME("only trying .exe when no extension given\n"); - memcpy(fullname+len, ".exe", 4); - len += 4; - } + args = msvcrt_argvtos_aw(argv, ' '); + envs = msvcrt_argvtos_aw(envv, 0); - fullname[len] = '\0'; + ret = msvcrt_spawn(flags, nameW, args, envs); - if (args) - { - ret = msvcrt_spawn(flags, fullname, args, envs); - MSVCRT_free(args); - } + MSVCRT_free(nameW); + MSVCRT_free(args); MSVCRT_free(envs); - return ret; } @@ -698,8 +575,8 @@ MSVCRT_intptr_t CDECL _spawnve(int flags, const char* name, const char* const* a MSVCRT_intptr_t CDECL _wspawnve(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) { - MSVCRT_wchar_t * args = msvcrt_argvtos_wide(argv,' '); - MSVCRT_wchar_t * envs = msvcrt_argvtos_wide(envv,0); + MSVCRT_wchar_t * args = msvcrt_argvtos(argv,' '); + MSVCRT_wchar_t * envs = msvcrt_argvtos(envv,0); MSVCRT_wchar_t fullname[MAX_PATH]; const MSVCRT_wchar_t *p; int len; @@ -739,7 +616,7 @@ MSVCRT_intptr_t CDECL _wspawnve(int flags, const MSVCRT_wchar_t* name, const MSV if (args) { - ret = msvcrt_spawn_wide(flags, fullname, args, envs); + ret = msvcrt_spawn(flags, fullname, args, envs); MSVCRT_free(args); } MSVCRT_free(envs); @@ -888,7 +765,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc strcatW(fullcmd, command); HeapFree(GetProcessHeap(), 0, comspec); - if (msvcrt_spawn_wide(MSVCRT__P_NOWAIT, NULL, fullcmd, NULL) == -1) + if (msvcrt_spawn(MSVCRT__P_NOWAIT, NULL, fullcmd, NULL) == -1) { MSVCRT__close(fds[fdToOpen]); ret = NULL; @@ -976,7 +853,7 @@ int CDECL _wsystem(const MSVCRT_wchar_t* cmd) strcatW(fullcmd, flag); strcatW(fullcmd, cmd); - res = msvcrt_spawn_wide(MSVCRT__P_WAIT, comspec, fullcmd, NULL); + res = msvcrt_spawn(MSVCRT__P_WAIT, comspec, fullcmd, NULL); HeapFree(GetProcessHeap(), 0, comspec); HeapFree(GetProcessHeap(), 0, fullcmd);

1 0

Hans Leidekker : msvcrt: Correct search strategy for the exec/ spawn functions.
by Alexandre Julliard Jan. 8, 2008

Jan. 8, 2008

Module: wine Branch: master Commit: 41575621c8100356b31a71fea4dbd4686644a0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=41575621c8100356b31a71fea… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 7 14:24:02 2008 +0100 msvcrt: Correct search strategy for the exec/spawn functions. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/process.c | 270 +++++++++++++++++++++++++++++-------------------- 2 files changed, 161 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41575621c8100356b31a7…

1 0