February 2007 - Wine-Commits

H. Verbeet : wined3d: Fix matching WINED3DDECLUSAGE_POSITION against WINED3DDECLUSAGE_POSITIONT.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: b299395f30697c16d42f8dc19fc76fc7647d352c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b299395f30697c16d42f8dc19… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 27 20:51:18 2007 +0100 wined3d: Fix matching WINED3DDECLUSAGE_POSITION against WINED3DDECLUSAGE_POSITIONT. --- dlls/wined3d/vertexshader.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 37c92f4..f027032 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -634,6 +634,15 @@ static void vshader_set_input( This->semantics_in[regnum].reg = reg_token; } +static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) { + if (usage_idx1 != usage_idx2) return FALSE; + if (usage1 == usage2) return TRUE; + if (usage1 == WINED3DDECLUSAGE_POSITION && usage2 == WINED3DDECLUSAGE_POSITIONT) return TRUE; + if (usage2 == WINED3DDECLUSAGE_POSITION && usage1 == WINED3DDECLUSAGE_POSITIONT) return TRUE; + + return FALSE; +} + BOOL vshader_get_input( IWineD3DVertexShader* iface, BYTE usage_req, BYTE usage_idx_req, @@ -647,7 +656,7 @@ BOOL vshader_get_input( DWORD usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; DWORD usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - if (usage_token && (usage == usage_req && usage_idx == usage_idx_req)) { + if (usage_token && match_usage(usage, usage_idx, usage_req, usage_idx_req)) { *regnum = i; return TRUE; } @@ -673,7 +682,7 @@ BOOL vshader_input_is_color( * if it has D3DCOLOR as it's type. This works for both d3d8 and d3d9. */ for (i = 0; i < vertexDeclaration->declarationWNumElements-1; ++i) { WINED3DVERTEXELEMENT *element = vertexDeclaration->pDeclarationWine + i; - if ((element->Usage == usage && element->UsageIndex == usage_idx)) { + if (match_usage(element->Usage, element->UsageIndex, usage, usage_idx)) { return element->Type == WINED3DDECLTYPE_D3DCOLOR; } }

1 0

Jeff Latimer : ntdll: Test object attributes in NtCreateMailslotFile.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 8b2a86a892eaf3a154473cd2f31f0cf1cad73ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2a86a892eaf3a154473cd2f… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 27 23:42:10 2007 +1100 ntdll: Test object attributes in NtCreateMailslotFile. --- dlls/ntdll/file.c | 4 ++++ dlls/ntdll/tests/file.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2929590..3d7c3eb 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2213,6 +2213,10 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, if (!pHandle) return STATUS_ACCESS_VIOLATION; + if (!attr) return STATUS_INVALID_PARAMETER; + + if (!attr->ObjectName) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if (attr->ObjectName->Length < sizeof(leadin) || strncmpiW( attr->ObjectName->Buffer, leadin, sizeof(leadin)/sizeof(leadin[0]) )) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index f3a3867..ee49b93 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -81,8 +81,40 @@ static void nt_mailslot_test(void) if ( rc == STATUS_SUCCESS ) rc = pNtClose(hslot); /* + * Test that the length field is checked properly + */ + attr.Length = 0; + rc = pNtCreateMailslotFile(&hslot, DesiredAccess, + &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, + &TimeOut); + todo_wine ok( rc == STATUS_INVALID_PARAMETER, "rc = %x not c000000d STATUS_INVALID_PARAMETER\n", rc); + + if (rc == STATUS_SUCCESS) pNtClose(hslot); + + attr.Length = sizeof(OBJECT_ATTRIBUTES)+1; + rc = pNtCreateMailslotFile(&hslot, DesiredAccess, + &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, + &TimeOut); + todo_wine ok( rc == STATUS_INVALID_PARAMETER, "rc = %x not c000000d STATUS_INVALID_PARAMETER\n", rc); + + if (rc == STATUS_SUCCESS) pNtClose(hslot); + + /* + * Test handling of a NULL unicode string in ObjectName + */ + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + attr.ObjectName = NULL; + rc = pNtCreateMailslotFile(&hslot, DesiredAccess, + &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, + &TimeOut); + ok( rc == STATUS_OBJECT_PATH_SYNTAX_BAD, "rc = %x not c000003b STATUS_OBJECT_PATH_SYNTAX_BAD\n", rc); + + if (rc == STATUS_SUCCESS) pNtClose(hslot); + + /* * Test a valid call */ + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); rc = pNtCreateMailslotFile(&hslot, DesiredAccess, &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, &TimeOut);

1 0

Jeff Latimer : ntdll: Set default timeout in NtCreateMailslotFile if parameter is NULL.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 74db5a192e6dc593ce77d5233dea8b1530eabb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74db5a192e6dc593ce77d5233… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 27 23:42:06 2007 +1100 ntdll: Set default timeout in NtCreateMailslotFile if parameter is NULL. --- dlls/ntdll/file.c | 11 ++++++++++- dlls/ntdll/tests/file.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ffda379..2929590 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2202,6 +2202,7 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, ULONG CreateOptions, ULONG MailslotQuota, ULONG MaxMessageSize, PLARGE_INTEGER TimeOut) { + LARGE_INTEGER timeout; static const WCHAR leadin[] = { '\\','?','?','\\','M','A','I','L','S','L','O','T','\\'}; NTSTATUS ret; @@ -2219,13 +2220,21 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, return STATUS_OBJECT_NAME_INVALID; } + /* + * For a NULL TimeOut pointer set the default timeout value + */ + if (!TimeOut) + timeout.QuadPart = -1; + else + timeout.QuadPart = TimeOut->QuadPart; + SERVER_START_REQ( create_mailslot ) { req->access = DesiredAccess; req->attributes = attr->Attributes; req->rootdir = attr->RootDirectory; req->max_msgsize = MaxMessageSize; - req->read_timeout = (TimeOut->QuadPart <= 0) ? TimeOut->QuadPart / -10000 : -1; + req->read_timeout = (timeout.QuadPart <= 0) ? timeout.QuadPart / -10000 : -1; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); ret = wine_server_call( req ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9baadfe..f3a3867 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -70,6 +70,17 @@ static void nt_mailslot_test(void) ok( rc == STATUS_ACCESS_VIOLATION, "rc = %x not c0000005 STATUS_ACCESS_VIOLATION\n", rc); /* + * Test to see if the Timeout can be NULL + */ + rc = pNtCreateMailslotFile(&hslot, DesiredAccess, + &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, + NULL); + ok( rc == STATUS_SUCCESS, "rc = %x not STATUS_SUCCESS\n", rc); + ok( hslot != 0, "Handle is invalid\n"); + + if ( rc == STATUS_SUCCESS ) rc = pNtClose(hslot); + + /* * Test a valid call */ rc = pNtCreateMailslotFile(&hslot, DesiredAccess,

1 0

Jeff Latimer : ntdll: Check for passing a NULL handle to NtCreateMailslotFile and add a test.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: cb489f7a2583442d47ce3a9b8c0298c120882bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb489f7a2583442d47ce3a9b8… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 27 23:42:02 2007 +1100 ntdll: Check for passing a NULL handle to NtCreateMailslotFile and add a test. --- dlls/ntdll/file.c | 2 ++ dlls/ntdll/tests/file.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cf9d64d..ffda379 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2210,6 +2210,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, pHandle, DesiredAccess, attr, IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, TimeOut); + if (!pHandle) return STATUS_ACCESS_VIOLATION; + if (attr->ObjectName->Length < sizeof(leadin) || strncmpiW( attr->ObjectName->Buffer, leadin, sizeof(leadin)/sizeof(leadin[0]) )) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 15ed4dc..9baadfe 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -55,11 +55,19 @@ static void nt_mailslot_test(void) WCHAR buffer1[] = { '\\','?','?','\\','M','A','I','L','S','L','O','T','\\', 'R',':','\\','F','R','E','D','\0' }; + TimeOut.QuadPart = -1; pRtlInitUnicodeString(&str, buffer1); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); DesiredAccess = CreateOptions = MailslotQuota = MaxMessageSize = 0; - TimeOut.QuadPart = -1; + + /* + * Check for NULL pointer handling + */ + rc = pNtCreateMailslotFile(NULL, DesiredAccess, + &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, + &TimeOut); + ok( rc == STATUS_ACCESS_VIOLATION, "rc = %x not c0000005 STATUS_ACCESS_VIOLATION\n", rc); /* * Test a valid call

1 0

Jeff Latimer : ntdll: Framework for NtCreateMailslotFile tests.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 2775db3b79c818780711f4aa7d23266c4619d3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2775db3b79c818780711f4aa7… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 27 23:41:55 2007 +1100 ntdll: Framework for NtCreateMailslotFile tests. --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/file.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index cccc4c5..3425b5c 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -14,6 +14,7 @@ CTESTS = \ generated.c \ info.c \ large_int.c \ + file.c \ om.c \ path.c \ port.c \ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c new file mode 100644 index 0000000..15ed4dc --- /dev/null +++ b/dlls/ntdll/tests/file.c @@ -0,0 +1,92 @@ +/* Unit test suite for Ntdll file functions + * + * Copyright 2007 Jeff Latimer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * NOTES + * We use function pointers here as there is no import library for NTDLL on + * windows. + */ + +#include <stdio.h> +#include <stdarg.h> + +#include "ntstatus.h" +/* Define WIN32_NO_STATUS so MSVC does not give us duplicate macro + * definition errors when we get to winnt.h + */ +#define WIN32_NO_STATUS + +#include "wine/test.h" +#include "winternl.h" + +static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); +static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, + ULONG, ULONG, ULONG, PLARGE_INTEGER ); +static NTSTATUS (WINAPI *pNtClose)( PHANDLE ); + +static void nt_mailslot_test(void) +{ + HANDLE hslot; + ACCESS_MASK DesiredAccess; + OBJECT_ATTRIBUTES attr; + + ULONG CreateOptions; + ULONG MailslotQuota; + ULONG MaxMessageSize; + LARGE_INTEGER TimeOut; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS rc; + UNICODE_STRING str; + WCHAR buffer1[] = { '\\','?','?','\\','M','A','I','L','S','L','O','T','\\', + 'R',':','\\','F','R','E','D','\0' }; + + + pRtlInitUnicodeString(&str, buffer1); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + DesiredAccess = CreateOptions = MailslotQuota = MaxMessageSize = 0; + TimeOut.QuadPart = -1; + + /* + * Test a valid call + */ + rc = pNtCreateMailslotFile(&hslot, DesiredAccess, + &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, + &TimeOut); + ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %x %u\n", rc, GetLastError()); + ok( hslot != 0, "Handle is invalid\n"); + + rc = pNtClose(hslot); + ok( rc == STATUS_SUCCESS, "NtClose failed\n"); + + pRtlFreeUnicodeString(&str); +} + +START_TEST(file) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + + if (hntdll) + { + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); + pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); + pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); + pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); + + nt_mailslot_test(); + } +}

1 0

Rob Shearman : rpcrt4: Set TCP_NODELAY on the socket for the ncacn_ip_tcp transport to reduce latency .
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 829dfa8052edea653074beeb12b5bda07dadb24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=829dfa8052edea653074beeb1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 27 18:14:03 2007 +0000 rpcrt4: Set TCP_NODELAY on the socket for the ncacn_ip_tcp transport to reduce latency. --- dlls/rpcrt4/rpc_transport.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index bd0a797..4d83670 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -43,6 +43,9 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif +#ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif @@ -742,6 +745,8 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) for (ai_cur = ai; ai_cur; ai_cur = ai_cur->ai_next) { + int val; + if (TRACE_ON(rpc)) { char host[256]; @@ -765,6 +770,11 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) close(sock); continue; } + + /* RPC depends on having minimal latency so disable the Nagle algorithm */ + val = 1; + setsockopt(sock, SOL_TCP, TCP_NODELAY, &val, sizeof(val)); + tcpc->sock = sock; freeaddrinfo(ai);

1 0

Vitaliy Margolen : ntdll: More error checking. Properly handle NULL ACLs.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: c0a5671d9ce14284ddf905bca9276632dd16bd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a5671d9ce14284ddf905bca… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Feb 27 07:28:18 2007 -0700 ntdll: More error checking. Properly handle NULL ACLs. --- dlls/advapi32/tests/security.c | 7 +++++++ dlls/ntdll/sec.c | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 95d2f9c..3e8459e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1477,10 +1477,17 @@ static void test_process_security(void) event = CreateEvent( NULL, TRUE, TRUE, "test_event" ); ok(event != NULL, "CreateEvent %d\n", GetLastError()); + SecurityDescriptor->Revision = 0; + CHECK_SET_SECURITY( event, OWNER_SECURITY_INFORMATION, ERROR_UNKNOWN_REVISION ); + SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION; + CHECK_SET_SECURITY( event, OWNER_SECURITY_INFORMATION, ERROR_INVALID_SECURITY_DESCR ); CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_INVALID_SECURITY_DESCR ); CHECK_SET_SECURITY( event, SACL_SECURITY_INFORMATION, ERROR_ACCESS_DENIED ); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + /* NULL DACL is valid and means default DACL from token */ + SecurityDescriptor->Control |= SE_DACL_PRESENT; + CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); /* Set owner and group and dacl */ res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 7380786..64384cf 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1569,34 +1569,39 @@ NTSTATUS WINAPI NtSetSecurityObject(HANDLE Handle, if (!SecurityDescriptor) return STATUS_ACCESS_VIOLATION; memset( &sd, 0, sizeof(sd) ); - RtlGetControlSecurityDescriptor( SecurityDescriptor, &control, &revision ); + status = RtlGetControlSecurityDescriptor( SecurityDescriptor, &control, &revision ); + if (status != STATUS_SUCCESS) return status; sd.control = control & ~SE_SELF_RELATIVE; if (SecurityInformation & OWNER_SECURITY_INFORMATION) { - RtlGetOwnerSecurityDescriptor( SecurityDescriptor, &owner, &defaulted ); + status = RtlGetOwnerSecurityDescriptor( SecurityDescriptor, &owner, &defaulted ); + if (status != STATUS_SUCCESS) return status; if (!(sd.owner_len = RtlLengthSid( owner ))) return STATUS_INVALID_SECURITY_DESCR; } if (SecurityInformation & GROUP_SECURITY_INFORMATION) { - RtlGetGroupSecurityDescriptor( SecurityDescriptor, &group, &defaulted ); + status = RtlGetGroupSecurityDescriptor( SecurityDescriptor, &group, &defaulted ); + if (status != STATUS_SUCCESS) return status; if (!(sd.group_len = RtlLengthSid( group ))) return STATUS_INVALID_SECURITY_DESCR; } if (SecurityInformation & SACL_SECURITY_INFORMATION) { - RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted ); - sd.sacl_len = present ? sacl->AclSize : 0; + status = RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted ); + if (status != STATUS_SUCCESS) return status; + sd.sacl_len = (sacl && present) ? sacl->AclSize : 0; sd.control |= SE_SACL_PRESENT; } if (SecurityInformation & DACL_SECURITY_INFORMATION) { - RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted ); - sd.dacl_len = present ? dacl->AclSize : 0; + status = RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted ); + if (status != STATUS_SUCCESS) return status; + sd.dacl_len = (dacl && present) ? dacl->AclSize : 0; sd.control |= SE_DACL_PRESENT; }

1 0

Huw Davies : msxml3: Implement {get,putref}_schemas.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: 1780ca678c372e2f788383eccf0bfa0b4853deba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1780ca678c372e2f788383ecc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 27 15:11:13 2007 +0000 msxml3: Implement {get,putref}_schemas. --- dlls/msxml3/domdoc.c | 66 ++++++++++++++++++++++---- dlls/msxml3/schema.c | 1 + dlls/msxml3/tests/schema.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1e2d8cd..8b3f561 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -171,6 +171,7 @@ typedef struct _domdoc VARIANT_BOOL preserving; IUnknown *node_unk; IXMLDOMNode *node; + IXMLDOMSchemaCollection *schema; HRESULT error; } domdoc; @@ -254,6 +255,7 @@ static ULONG WINAPI domdoc_Release( if ( ref == 0 ) { IUnknown_Release( This->node_unk ); + if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); HeapFree( GetProcessHeap(), 0, This ); } @@ -1293,7 +1295,7 @@ static HRESULT WINAPI domdoc_put_onTransformNode( } static HRESULT WINAPI domdoc_get_namespaces( - IXMLDOMDocument2* This, + IXMLDOMDocument2* iface, IXMLDOMSchemaCollection** schemaCollection ) { FIXME("\n"); @@ -1301,23 +1303,66 @@ static HRESULT WINAPI domdoc_get_namespaces( } static HRESULT WINAPI domdoc_get_schemas( - IXMLDOMDocument2* This, + IXMLDOMDocument2* iface, VARIANT* var1 ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + HRESULT hr = S_FALSE; + IXMLDOMSchemaCollection *cur_schema = This->schema; + + TRACE("(%p)->(%p)\n", This, var1); + + VariantInit(var1); /* Test shows we don't call VariantClear here */ + V_VT(var1) = VT_NULL; + + if(cur_schema) + { + hr = IXMLDOMSchemaCollection_QueryInterface(cur_schema, &IID_IDispatch, (void**)&V_DISPATCH(var1)); + if(SUCCEEDED(hr)) + V_VT(var1) = VT_DISPATCH; + } + return hr; } static HRESULT WINAPI domdoc_putref_schemas( - IXMLDOMDocument2* This, + IXMLDOMDocument2* iface, VARIANT var1) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + HRESULT hr = E_FAIL; + IXMLDOMSchemaCollection *new_schema = NULL; + + FIXME("(%p): semi-stub\n", This); + switch(V_VT(&var1)) + { + case VT_UNKNOWN: + hr = IUnknown_QueryInterface(V_UNKNOWN(&var1), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + break; + + case VT_DISPATCH: + hr = IDispatch_QueryInterface(V_DISPATCH(&var1), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + break; + + case VT_NULL: + case VT_EMPTY: + hr = S_OK; + break; + + default: + WARN("Can't get schema from vt %x\n", V_VT(&var1)); + } + + if(SUCCEEDED(hr)) + { + IXMLDOMSchemaCollection *old_schema = InterlockedExchangePointer((void**)&This->schema, new_schema); + if(old_schema) IXMLDOMSchemaCollection_Release(old_schema); + } + + return hr; } static HRESULT WINAPI domdoc_validate( - IXMLDOMDocument2* This, + IXMLDOMDocument2* iface, IXMLDOMParseError** err) { FIXME("\n"); @@ -1325,7 +1370,7 @@ static HRESULT WINAPI domdoc_validate( } static HRESULT WINAPI domdoc_setProperty( - IXMLDOMDocument2* This, + IXMLDOMDocument2* iface, BSTR p, VARIANT var) { @@ -1334,7 +1379,7 @@ static HRESULT WINAPI domdoc_setProperty( } static HRESULT WINAPI domdoc_getProperty( - IXMLDOMDocument2* This, + IXMLDOMDocument2* iface, BSTR p, VARIANT* var) { @@ -1447,6 +1492,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->resolving = 0; doc->preserving = 0; doc->error = S_OK; + doc->schema = NULL; xmldoc = xmlNewDoc(NULL); if(!xmldoc) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index f823e78..5d48321 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -55,6 +55,7 @@ static HRESULT WINAPI schema_cache_QueryInterface( IXMLDOMSchemaCollection *ifac TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); if ( IsEqualIID( riid, &IID_IUnknown ) || + IsEqualIID( riid, &IID_IDispatch ) || IsEqualIID( riid, &IID_IXMLDOMSchemaCollection ) ) { *ppvObject = iface; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 8651aa9..b012621 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -86,8 +86,118 @@ void test_schema_refs(void) SysFreeString(str); VariantClear(&v); + V_VT(&v) = VT_INT; + r = IXMLDOMDocument2_get_schemas(doc, &v); + ok(r == S_FALSE, "ret %08x\n", r); + ok(V_VT(&v) == VT_NULL, "vt %x\n", V_VT(&v)); + + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 2, "ref %d\n", ref); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)schema; + + /* check that putref_schemas takes a ref */ + r = IXMLDOMDocument2_putref_schemas(doc, v); + ok(r == S_OK, "ret %08x\n", r); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 4, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + VariantClear(&v); + + /* refs now 2 */ + V_VT(&v) = VT_INT; + /* check that get_schemas adds a ref */ + r = IXMLDOMDocument2_get_schemas(doc, &v); + ok(r == S_OK, "ret %08x\n", r); + ok(V_VT(&v) == VT_DISPATCH, "vt %x\n", V_VT(&v)); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 4, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + + /* refs now 3 */ + /* get_schemas doesn't release a ref if passed VT_DISPATCH - ie it doesn't call VariantClear() */ + r = IXMLDOMDocument2_get_schemas(doc, &v); + ok(r == S_OK, "ret %08x\n", r); + ok(V_VT(&v) == VT_DISPATCH, "vt %x\n", V_VT(&v)); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 5, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + + /* refs now 4 */ + /* release the two refs returned by get_schemas */ + IXMLDOMSchemaCollection_Release(schema); + IXMLDOMSchemaCollection_Release(schema); + + /* refs now 2 */ + + /* check that taking another ref on the document doesn't change the schema's ref count */ + IXMLDOMDocument2_AddRef(doc); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 3, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + IXMLDOMDocument2_Release(doc); + + + /* refs now 2 */ + /* call putref_schema with some odd variants */ + V_VT(&v) = VT_INT; + r = IXMLDOMDocument2_putref_schemas(doc, v); + ok(r == E_FAIL, "ret %08x\n", r); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 3, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + + /* refs now 2 */ + /* calling with VT_EMPTY releases the schema */ + V_VT(&v) = VT_EMPTY; + r = IXMLDOMDocument2_putref_schemas(doc, v); + ok(r == S_OK, "ret %08x\n", r); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 2, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + + /* refs now 1 */ + /* try setting with VT_UNKNOWN */ + IXMLDOMSchemaCollection_AddRef(schema); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)schema; + r = IXMLDOMDocument2_putref_schemas(doc, v); + ok(r == S_OK, "ret %08x\n", r); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 4, "ref %d\n", ref); IXMLDOMSchemaCollection_Release(schema); + VariantClear(&v); + + /* refs now 2 */ + /* calling with VT_NULL releases the schema */ + V_VT(&v) = VT_NULL; + r = IXMLDOMDocument2_putref_schemas(doc, v); + ok(r == S_OK, "ret %08x\n", r); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 2, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + + /* refs now 1 */ + /* set again */ + IXMLDOMSchemaCollection_AddRef(schema); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)schema; + r = IXMLDOMDocument2_putref_schemas(doc, v); + ok(r == S_OK, "ret %08x\n", r); + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 4, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + VariantClear(&v); + + /* refs now 2 */ + + /* release the final ref on the doc which should release its ref on the schema */ IXMLDOMDocument2_Release(doc); + + ref = IXMLDOMSchemaCollection_AddRef(schema); + ok(ref == 2, "ref %d\n", ref); + IXMLDOMSchemaCollection_Release(schema); + IXMLDOMSchemaCollection_Release(schema); } START_TEST(schema)

1 0

Huw Davies : msxml3: Add a schema cache object.
by Alexandre Julliard Feb. 28, 2007

Feb. 28, 2007

Module: wine Branch: master Commit: c30c6e23ba716f6fb61f953c8c6e2e5fc58e58f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30c6e23ba716f6fb61f953c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 27 12:32:02 2007 +0000 msxml3: Add a schema cache object. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/factory.c | 11 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 204 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/schema.c | 103 +++++++++++++++++++++ 6 files changed, 319 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c30c6e23ba716f6fb61f9…

1 0

tools/winetest dissect
by Jeremy Newman Feb. 27, 2007

Feb. 27, 2007

ChangeSet ID: 30938 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/02/27 13:59:39 Modified files: winetest : dissect Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> fix for the last patch Patch: http://cvs.winehq.org/patch.py?id=30938 Old revision New revision Changes Path 1.19 1.20 +1 -1 tools/winetest/dissect Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.19 tools/winetest/dissect:1.20 --- tools/winetest/dissect:1.19 27 Feb 2007 19:59:39 -0000 +++ tools/winetest/dissect 27 Feb 2007 19:59:39 -0000 @@ -159,7 +159,7 @@ while (<IN>) { <IN>; # current test finished $result = "$2 $3 $4"; goto FINISH; - } elsif (s/^($test: (\d+) tests executed $(\d+) marked as todo, (\d+) failures$, (\d+) skipped?\.)\r?$/$1/) { + } elsif (s/^($test: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/$1/) { <IN>; # current test finished $result = "$2 $3 $4"; FINISH:

1 0