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

Andrew Talbot : crypt32/tests: Write-strings warnings test.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: ee9b18f04b84568a3a2ac5aabc50e86fc2945061 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee9b18f04b84568a3a2ac5a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 8 20:29:13 2006 +0100 crypt32/tests: Write-strings warnings test. --- dlls/crypt32/tests/encode.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3b6137f..52aeaa9 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -659,6 +659,8 @@ static void test_encodeName(DWORD dwEnco CERT_RDN_ATTR attrs[2]; CERT_RDN rdn; CERT_NAME_INFO info; + static CHAR oid_common_name[] = szOID_COMMON_NAME, + oid_sur_name[] = szOID_SUR_NAME; BYTE *buf = NULL; DWORD size = 0; BOOL ret; @@ -721,11 +723,11 @@ static void test_encodeName(DWORD dwEnco /* Check with two CERT_RDN_ATTRs. Note DER encoding forces the order of * the encoded attributes to be swapped. */ - attrs[0].pszObjId = szOID_COMMON_NAME; + attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[0].Value.cbData = sizeof(commonName); attrs[0].Value.pbData = (BYTE *)commonName; - attrs[1].pszObjId = szOID_SUR_NAME; + attrs[1].pszObjId = oid_sur_name; attrs[1].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[1].Value.cbData = sizeof(surName); attrs[1].Value.pbData = (BYTE *)surName; @@ -2839,6 +2841,7 @@ static void test_encodeCRLToBeSigned(DWO { BOOL ret; BYTE *buf = NULL; + static CHAR oid_issuing_dist_point[] = szOID_ISSUING_DIST_POINT; DWORD size = 0; CRL_INFO info = { 0 }; CRL_ENTRY entry = { { 0 }, { 0 }, 0, 0 }; @@ -2948,7 +2951,7 @@ static void test_encodeCRLToBeSigned(DWO LocalFree(buf); } /* a v2 CRL with an issuing dist point extension */ - ext.pszObjId = szOID_ISSUING_DIST_POINT; + ext.pszObjId = oid_issuing_dist_point; ext.fCritical = TRUE; ext.Value.cbData = sizeof(urlIDP); ext.Value.pbData = (LPBYTE)urlIDP;

1 0

Bang Jun-Young : amstream: Fix argument types to match the PSDK.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: e4d3a7216542a575c0d5b8d5bb44e7828bf46c85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4d3a7216542a575c0d5b8d… Author: Bang Jun-Young <bang.junyoung(a)gmail.com> Date: Mon Jul 10 17:16:18 2006 +0900 amstream: Fix argument types to match the PSDK. --- dlls/amstream/amstream.c | 2 +- include/mmstream.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index d17b456..0001f1f 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -110,7 +110,7 @@ static ULONG WINAPI IAMMultiMediaStreamI } /*** IMultiMediaStream methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, char* pdwFlags, STREAM_TYPE* pStreamType) +static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, DWORD* pdwFlags, STREAM_TYPE* pStreamType) { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; diff --git a/include/mmstream.idl b/include/mmstream.idl index c488959..19d3421 100644 --- a/include/mmstream.idl +++ b/include/mmstream.idl @@ -90,7 +90,7 @@ pointer_default(unique) interface IMultiMediaStream : IUnknown { HRESULT GetInformation( - [out, optional] char *pdwFlags, + [out, optional] DWORD *pdwFlags, [out, optional] STREAM_TYPE *pStreamType); HRESULT GetMediaStream(

1 0

Alexandre Julliard : server: Fixed get_thread_context for x86_64.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: c242c3b3f3626de8110a6bd2aa1b5fc174e6a433 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c242c3b3f3626de8110a6bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 12:06:38 2006 +0200 server: Fixed get_thread_context for x86_64. --- server/ptrace.c | 51 +++++++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 30 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 7aea8d5..c3d7249 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -29,9 +29,6 @@ #include <sys/types.h> #ifdef HAVE_SYS_PTRACE_H # include <sys/ptrace.h> #endif -#ifdef HAVE_SYS_REG_H -#include <sys/reg.h> -#endif #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -468,44 +465,38 @@ # include <sys/user.h> #endif /* debug register offset in struct user */ -#define DR_OFFSET(dr) ((int)((((struct user *)0)->u_debugreg) + (dr))) - -/* retrieve a debug register */ -static inline int get_debug_reg( int pid, int num, DWORD *data ) -{ - int res; - errno = 0; - res = ptrace( PTRACE_PEEKUSER, pid, DR_OFFSET(num), 0 ); - if ((res == -1) && errno) - { - file_set_error(); - return -1; - } - *data = res; - return 0; -} +#define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr)) /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { - int pid = get_ptrace_pid(thread); + int i, pid = get_ptrace_pid(thread); + long data[8]; /* all other regs are handled on the client side */ assert( (flags | CONTEXT_i386) == CONTEXT_DEBUG_REGISTERS ); if (!suspend_for_ptrace( thread )) return; - if (get_debug_reg( pid, 0, &context->Dr0 ) == -1) goto error; - if (get_debug_reg( pid, 1, &context->Dr1 ) == -1) goto error; - if (get_debug_reg( pid, 2, &context->Dr2 ) == -1) goto error; - if (get_debug_reg( pid, 3, &context->Dr3 ) == -1) goto error; - if (get_debug_reg( pid, 6, &context->Dr6 ) == -1) goto error; - if (get_debug_reg( pid, 7, &context->Dr7 ) == -1) goto error; + for (i = 0; i < 8; i++) + { + if (i == 4 || i == 5) continue; + errno = 0; + data[i] = ptrace( PTRACE_PEEKUSER, pid, DR_OFFSET(i), 0 ); + if ((data[i] == -1) && errno) + { + file_set_error(); + goto done; + } + } + context->Dr0 = data[0]; + context->Dr1 = data[1]; + context->Dr2 = data[2]; + context->Dr3 = data[3]; + context->Dr6 = data[6]; + context->Dr7 = data[7]; context->ContextFlags |= CONTEXT_DEBUG_REGISTERS; - resume_after_ptrace( thread ); - return; - error: - file_set_error(); +done: resume_after_ptrace( thread ); }

1 0

Mikołaj Zalewski : notepad: En.rc: Fix the ellipsis in menu.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: a5ebefc07f9ca7666db67578f02d33e31797827b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5ebefc07f9ca7666db6757… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 11 11:18:56 2006 +0200 notepad: En.rc: Fix the ellipsis in menu. --- programs/notepad/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index fa459e6..3bf6475 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "&File" { - MENUITEM "&New...\tCtrl+N", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN + MENUITEM "&New\tCtrl+N", CMD_NEW + MENUITEM "&Open...\tCtrl+O", CMD_OPEN MENUITEM "&Save\tCtrl+S", CMD_SAVE MENUITEM "Save &as...", CMD_SAVE_AS MENUITEM SEPARATOR

1 0

Huw Davies : msxml3: Implement removeChild.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 187ab1c028bf02734f841e9404c4aefa91d889aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=187ab1c028bf02734f841e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 10 14:48:45 2006 +0100 msxml3: Implement removeChild. --- dlls/msxml3/node.c | 34 +++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 67 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 95 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 312edae..d7af878 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -444,8 +444,38 @@ static HRESULT WINAPI xmlnode_removeChil IXMLDOMNode* childNode, IXMLDOMNode** oldChild) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlNode *ancestor, *child_node_ptr; + HRESULT hr; + IXMLDOMNode *child; + + TRACE("%p->(%p, %p)\n", This, childNode, oldChild); + + *oldChild = NULL; + hr = IXMLDOMNode_QueryInterface(childNode, &IID_IXMLDOMNode, (LPVOID)&child); + if(FAILED(hr)) + return hr; + + child_node_ptr = ancestor = impl_from_IXMLDOMNode(child)->node; + while(ancestor->parent) + { + if(ancestor->parent == This->node) + break; + ancestor = ancestor->parent; + } + if(!ancestor->parent) + { + WARN("childNode %p is not a child of %p\n", childNode, iface); + IXMLDOMNode_Release(child); + return E_INVALIDARG; + } + + xmlUnlinkNode(child_node_ptr); + + IXMLDOMNode_Release(child); + IXMLDOMNode_AddRef(childNode); + *oldChild = childNode; + return S_OK; } static HRESULT WINAPI xmlnode_appendChild( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 808ad93..7cd0822 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -59,6 +59,11 @@ static const WCHAR szComplete4[] = { 'f','n','2','.','t','x','t','\n', '<','/','p','r','>','\n', '<','e','m','p','t','y','>','<','/','e','m','p','t','y','>','\n', + '<','f','o','>','\n', + '<','b','a','>','\n', + 'f','1','\n', + '<','/','b','a','>','\n', + '<','/','f','o','>','\n', '<','/','l','c','>','\n',0 }; static const WCHAR szComplete5[] = { @@ -517,7 +522,7 @@ todo_wine { r = IXMLDOMNodeList_get_length( list, &count ); ok( r == S_OK, "get_length returns %08lx\n", r ); - ok( count == 3, "get_length got %ld\n", count ); + ok( count == 4, "get_length got %ld\n", count ); r = IXMLDOMNodeList_nextNode( list, &node ); ok( r == S_OK, "nextNode returned wrong code\n"); @@ -858,7 +863,7 @@ static void test_getElementsByTagName(vo ok( r == S_OK, "ret %08lx\n", r ); r = IXMLDOMNodeList_get_length( node_list, &len ); ok( r == S_OK, "ret %08lx\n", r ); - ok( len == 4, "len %ld\n", len ); + ok( len == 6, "len %ld\n", len ); IXMLDOMNodeList_Release( node_list ); SysFreeString( str ); @@ -989,7 +994,7 @@ static void test_get_childNodes(void) r = IXMLDOMNodeList_get_length( node_list, &len ); ok( r == S_OK, "ret %08lx\n", r); - ok( len == 3, "len %ld\n", len); + ok( len == 4, "len %ld\n", len); r = IXMLDOMNodeList_get_item( node_list, 2, &node ); ok( r == S_OK, "ret %08lx\n", r); @@ -1010,7 +1015,60 @@ static void test_get_childNodes(void) IXMLDOMElement_Release( element ); IXMLDOMDocument_Release( doc ); } - + +static void test_removeChild(void) +{ + HRESULT r; + BSTR str; + VARIANT_BOOL b; + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *node, *node2, *node3, *node4; + IXMLDOMNodeList *node_list, *node_list2; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_documentElement( doc, &element ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMElement_get_childNodes( element, &node_list ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMNodeList_get_item( node_list, 3, &node ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMNode_get_childNodes( node, &node_list2 ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMNodeList_get_item( node_list, 0, &node4 ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMElement_removeChild( element, node4, &node2 ); + ok( r == S_OK, "ret %08lx\n", r); + ok( node4 == node2, "node %p node2 %p\n", node4, node2 ); + + r = IXMLDOMNode_get_parentNode( node4, &node3 ); + ok( r == S_FALSE, "ret %08lx\n", r); + ok( node3 == NULL, "%p\n", node3 ); + + IXMLDOMNode_Release( node2 ); + IXMLDOMNode_Release( node4 ); + IXMLDOMNodeList_Release( node_list2 ); + IXMLDOMNode_Release( node ); + IXMLDOMNodeList_Release( node_list ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); +} + START_TEST(domdoc) { HRESULT r; @@ -1025,6 +1083,7 @@ START_TEST(domdoc) test_getElementsByTagName(); test_get_text(); test_get_childNodes(); + test_removeChild(); CoUninitialize(); }

1 0

Hans Leidekker : dnsapi: Fix a buffer overrun (Coverity).
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: dfd22085bb2bb2c85d8895aad2471b5f2d278bac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfd22085bb2bb2c85d8895a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 10 22:18:50 2006 +0200 dnsapi: Fix a buffer overrun (Coverity). --- dlls/dnsapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 2bcd913..4c95b9d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -496,7 +496,7 @@ static DNS_STATUS dns_do_query_netbios( memset( ncb.ncb_callname, ' ', sizeof(ncb.ncb_callname) ); memcpy( ncb.ncb_callname, name, len ); - ncb.ncb_callname[NCBNAMSZ] = '\0'; + ncb.ncb_callname[NCBNAMSZ - 1] = '\0'; ret = Netbios( &ncb ); if (ret != NRC_GOODRET) return ERROR_INVALID_NAME;

1 0

Hans Leidekker : wldap32: Document the ber functions.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: cc7118594d691e4eb71bd5fa0c9b05cfad265270 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc7118594d691e4eb71bd5f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 10 22:18:40 2006 +0200 wldap32: Document the ber functions. --- dlls/wldap32/ber.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 31c4b6f..c037a16 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -34,6 +34,18 @@ #endif /*********************************************************************** * ber_alloc_t (WLDAP32.@) + * + * Allocate a berelement structure. + * + * PARAMS + * options [I] Must be LBER_USE_DER. + * + * RETURNS + * Success: Pointer to an allocated berelement structure. + * Failure: NULL + * + * NOTES + * Free the berelement structure with ber_free. */ BerElement * CDECL WLDAP32_ber_alloc_t( INT options ) { @@ -47,6 +59,18 @@ #endif /*********************************************************************** * ber_bvdup (WLDAP32.@) + * + * Copy a berval structure. + * + * PARAMS + * berval [I] Pointer to the berval structure to be copied. + * + * RETURNS + * Success: Pointer to a copy of the berval structure. + * Failure: NULL + * + * NOTES + * Free the copy with ber_bvfree. */ BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL *berval ) { @@ -60,6 +84,18 @@ #endif /*********************************************************************** * ber_bvecfree (WLDAP32.@) + * + * Free an array of berval structures. + * + * PARAMS + * berval [I] Pointer to an array of berval structures. + * + * RETURNS + * Nothing. + * + * NOTES + * Use this function only to free an array of berval structures + * returned by a call to ber_scanf with a 'V' in the format string. */ void CDECL WLDAP32_ber_bvecfree( PBERVAL *berval ) { @@ -71,6 +107,18 @@ #endif /*********************************************************************** * ber_bvfree (WLDAP32.@) + * + * Free a berval structure. + * + * PARAMS + * berval [I] Pointer to a berval structure. + * + * RETURNS + * Nothing. + * + * NOTES + * Use this function only to free berval structures allocated by + * an LDAP API. */ void CDECL WLDAP32_ber_bvfree( BERVAL *berval ) { @@ -82,6 +130,20 @@ #endif /*********************************************************************** * ber_first_element (WLDAP32.@) + * + * Return the tag of the first element in a set or sequence. + * + * PARAMS + * berelement [I] Pointer to a berelement structure. + * len [O] Receives the length of the first element. + * opaque [O] Receives a pointer to a cookie. + * + * RETURNS + * Success: Tag of the first element. + * Failure: LBER_DEFAULT (no more data). + * + * NOTES + * len and cookie should be passed to ber_next_element. */ ULONG CDECL WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaque ) { @@ -95,6 +157,19 @@ #endif /*********************************************************************** * ber_flatten (WLDAP32.@) + * + * Flatten a berelement structure into a berval structure. + * + * PARAMS + * berlement [I] Pointer to a berelement structure. + * berval [O] Pointer to a berval structure. + * + * RETURNS + * Success: 0 + * Failure: LBER_ERROR + * + * NOTES + * Free the berval structure with ber_bvfree. */ INT CDECL WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval ) { @@ -108,6 +183,19 @@ #endif /*********************************************************************** * ber_free (WLDAP32.@) + * + * Free a berelement structure. + * + * PARAMS + * berlement [I] Pointer to the berelement structure to be freed. + * buf [I] Flag. + * + * RETURNS + * Nothing. + * + * NOTES + * Set buf to 0 if the berelement was allocated with ldap_first_attribute + * or ldap_next_attribute, otherwise set it to 1. */ void CDECL WLDAP32_ber_free( BerElement *berelement, INT buf ) { @@ -119,6 +207,18 @@ #endif /*********************************************************************** * ber_init (WLDAP32.@) + * + * Initialise a berelement structure from a berval structure. + * + * PARAMS + * berval [I] Pointer to a berval structure. + * + * RETURNS + * Success: Pointer to a berelement structure. + * Failure: NULL + * + * NOTES + * Call ber_free to free the returned berelement structure. */ BerElement * CDECL WLDAP32_ber_init( BERVAL *berval ) { @@ -132,6 +232,21 @@ #endif /*********************************************************************** * ber_next_element (WLDAP32.@) + * + * Return the tag of the next element in a set or sequence. + * + * PARAMS + * berelement [I] Pointer to a berelement structure. + * len [I/O] Receives the length of the next element. + * opaque [I/O] Pointer to a cookie. + * + * RETURNS + * Success: Tag of the next element. + * Failure: LBER_DEFAULT (no more data). + * + * NOTES + * len and cookie are intitialised by ber_first_element and should + * be passed on in subsequent calls to ber_next_element. */ ULONG CDECL WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque ) { @@ -145,6 +260,16 @@ #endif /*********************************************************************** * ber_peek_tag (WLDAP32.@) + * + * Return the tag of the next element. + * + * PARAMS + * berelement [I] Pointer to a berelement structure. + * len [O] Receives the length of the next element. + * + * RETURNS + * Success: Tag of the next element. + * Failure: LBER_DEFAULT (no more data). */ ULONG CDECL WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len ) { @@ -158,6 +283,16 @@ #endif /*********************************************************************** * ber_skip_tag (WLDAP32.@) + * + * Skip the current tag and return the tag of the next element. + * + * PARAMS + * berelement [I] Pointer to a berelement structure. + * len [O] Receives the length of the skipped element. + * + * RETURNS + * Success: Tag of the next element. + * Failure: LBER_DEFAULT (no more data). */ ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) { @@ -171,6 +306,21 @@ #endif /*********************************************************************** * ber_printf (WLDAP32.@) + * + * Encode a berelement structure. + * + * PARAMS + * berelement [I/O] Pointer to a berelement structure. + * fmt [I] Format string. + * ... [I] Values to encode. + * + * RETURNS + * Success: Non-negative number. + * Failure: LBER_ERROR + * + * NOTES + * berelement must have been allocated with ber_alloc_t. This function + * can be called multiple times to append data. */ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { @@ -250,6 +400,21 @@ #endif /*********************************************************************** * ber_scanf (WLDAP32.@) + * + * Decode a berelement structure. + * + * PARAMS + * berelement [I/O] Pointer to a berelement structure. + * fmt [I] Format string. + * ... [I] Pointers to values to be decoded. + * + * RETURNS + * Success: Non-negative number. + * Failure: LBER_ERROR + * + * NOTES + * berelement must have been allocated with ber_init. This function + * can be called multiple times to decode data. */ INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) {

1 0

Hans Leidekker : wldap32: Document the rename functions.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: cbdcc38e047ef4c0e0aa72c252aaa6792ccfff5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cbdcc38e047ef4c0e0aa72c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 10 22:18:30 2006 +0200 wldap32: Document the rename functions. --- dlls/wldap32/rename.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/rename.c b/dlls/wldap32/rename.c index 1ca8a4d..47842b5 100644 --- a/dlls/wldap32/rename.c +++ b/dlls/wldap32/rename.c @@ -40,6 +40,11 @@ #include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_rename_extA (WLDAP32.@) + * + * See ldap_rename_extW. + */ ULONG CDECL ldap_rename_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn, PCHAR newparent, INT delete, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) @@ -92,6 +97,30 @@ #endif return ret; } +/*********************************************************************** + * ldap_rename_extW (WLDAP32.@) + * + * Change the DN of a directory entry (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * newrdn [I] New RDN for the entry. + * newparent [I] New parent for the entry. + * delete [I] Delete old RDN? + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG CDECL ldap_rename_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn, PWCHAR newparent, INT delete, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) @@ -144,6 +173,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_rename_ext_sA (WLDAP32.@) + * + * See ldap_rename_ext_sW. + */ ULONG CDECL ldap_rename_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newrdn, PCHAR newparent, INT delete, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) @@ -195,7 +229,24 @@ exit: #endif return ret; } - +/*********************************************************************** + * ldap_rename_ext_sW (WLDAP32.@) + * + * Change the DN of a directory entry (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to change. + * newrdn [I] New RDN for the entry. + * newparent [I] New parent for the entry. + * delete [I] Delete old RDN? + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG CDECL ldap_rename_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn, PWCHAR newparent, INT delete, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )

1 0

Hans Leidekker : wine.inf: Add msi to the list of fake dlls.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: ac962be1fc65e623ed736fd685623dc733d23409 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac962be1fc65e623ed736fd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 10 22:18:19 2006 +0200 wine.inf: Add msi to the list of fake dlls. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 95e3589..d1a280e 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2132,6 +2132,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,kernel32.dll 11,,msadp32.acm 11,,msg711.acm +11,,msi.dll 11,,msiexec.exe 11,,msvcrt.dll 11,,notepad.exe

1 0

Piotr Caban : oleview: Added more fields to TypeLib Viewer tree.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: cf0833b9d3d44898f611a70c782314f7ac3ae386 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf0833b9d3d44898f611a70… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 10 12:07:51 2006 +0200 oleview: Added more fields to TypeLib Viewer tree. --- programs/oleview/En.rc | 1 programs/oleview/resource.h | 1 programs/oleview/typelib.c | 170 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 165 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cf0833b9d3d44898f61…

1 0