September 2006 - Wine-Commits

Dan Hipschman : msxml3: Fix IXMLDOMNamedNodeMap_getNamedItem() conformance on error.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 47b6d3a1e3a19796eb8b5a4578eba48a7fb23401 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47b6d3a1e3a19796eb8b5a4… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 20 16:41:30 2006 -0700 msxml3: Fix IXMLDOMNamedNodeMap_getNamedItem() conformance on error. --- dlls/msxml3/nodemap.c | 10 ++++++++-- dlls/msxml3/tests/domdoc.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 32fd32c..0797436 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -165,7 +165,10 @@ static HRESULT WINAPI xmlnodemap_getName xmlAttrPtr attr; xmlNodePtr node; - TRACE("%p %s\n", This, debugstr_w(name) ); + TRACE("%p %s %p\n", This, debugstr_w(name), namedItem ); + + if ( !namedItem ) + return E_INVALIDARG; node = xmlNodePtr_from_domnode( This->node, 0 ); if ( !node ) @@ -176,7 +179,10 @@ static HRESULT WINAPI xmlnodemap_getName HeapFree( GetProcessHeap(), 0, element_name ); if ( !attr ) - return E_FAIL; + { + *namedItem = NULL; + return S_FALSE; + } *namedItem = create_node( (xmlNodePtr) attr ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index aaad036..4a3fdc1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -396,6 +396,19 @@ todo_wine IXMLDOMNode_Release(node); SysFreeString( str ); + str = SysAllocString( szdl ); + r = IXMLDOMNamedNodeMap_getNamedItem( map, str, NULL ); + ok( r == E_INVALIDARG, "getNamedItem should return E_INVALIDARG\n"); + SysFreeString( str ); + + /* something that isn't in szComplete4 */ + str = SysAllocString( szOpen ); + node = (IXMLDOMNode *) 1; + r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node ); + ok( r = S_FALSE, "getNamedItem found a node that wasn't there\n"); + ok( node == NULL, "getNamedItem should have returned NULL\n"); + SysFreeString( str ); + /* test indexed access of attributes */ r = IXMLDOMNamedNodeMap_get_length( map, &count ); ok ( r == S_OK, "get_length wrong code\n");

1 0

Benjamin Arai : oleaut32: Conformance test for function variant:VarImp.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 8d921f1d3cc0dac880e78817745f8255b9123aa3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d921f1d3cc0dac880e7881… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Sep 20 13:19:04 2006 -0700 oleaut32: Conformance test for function variant:VarImp. --- dlls/oleaut32/tests/vartest.c | 508 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 508 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8d921f1d3cc0dac880e…

1 0

Benjamin Arai : oleaut32: Implementation for function variant:VarImp.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 4cb6c9184b24f9be421306f15f9d1a05515c90a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cb6c9184b24f9be421306f… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Sep 20 13:17:58 2006 -0700 oleaut32: Implementation for function variant:VarImp. --- dlls/oleaut32/oleaut32.spec | 2 dlls/oleaut32/variant.c | 227 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index ad110c7..abffbd2 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -148,7 +148,7 @@ 150 stdcall SysAllocStringByteLen(ptr long) 152 stdcall VarEqv(ptr ptr ptr) 153 stdcall VarIdiv(ptr ptr ptr) -154 stub VarImp # stdcall (ptr ptr ptr) +154 stdcall VarImp(ptr ptr ptr) 155 stdcall VarMod(ptr ptr ptr) 156 stdcall VarMul(ptr ptr ptr) 157 stdcall VarOr(ptr ptr ptr) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ae27ad0..c8044a9 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5280,3 +5280,230 @@ HRESULT WINAPI VarPow(LPVARIANT left, LP return S_OK; } + +/********************************************************************** + * VarImp [OLEAUT32.154] + * + * Bitwise implication of two variants. + * + * PARAMS + * left [I] First variant + * right [I] Second variant + * result [O] Result variant + * + * RETURNS + * Success: S_OK. + * Failure: An HRESULT error code indicating the error. + */ +HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result) +{ + HRESULT hres = S_OK; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; + VARIANT lv,rv; + double d; + + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); + + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; + + TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), + debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + + /* Native VarImp always returns a error when using any extra + * flags or if the variants are I8 and INT. + */ + if ((leftvt == VT_I8 && rightvt == VT_INT) || + ExtraFlags != 0) + return DISP_E_BADVARTYPE; + + /* Determine result type */ + else if ((leftvt == VT_NULL && rightvt == VT_NULL) || + (leftvt == VT_NULL && rightvt == VT_EMPTY)) + { + V_VT(result) = VT_NULL; + return S_OK; + } + else if (leftvt == VT_I8 || rightvt == VT_I8) + resvt = VT_I8; + else if (leftvt == VT_I4 || rightvt == VT_I4 || + leftvt == VT_INT || rightvt == VT_INT || + leftvt == VT_UINT || rightvt == VT_UINT || + leftvt == VT_UI4 || rightvt == VT_UI4 || + leftvt == VT_UI8 || rightvt == VT_UI8 || + leftvt == VT_UI2 || rightvt == VT_UI2 || + leftvt == VT_DECIMAL || rightvt == VT_DECIMAL || + leftvt == VT_DATE || rightvt == VT_DATE || + leftvt == VT_CY || rightvt == VT_CY || + leftvt == VT_R8 || rightvt == VT_R8 || + leftvt == VT_R4 || rightvt == VT_R4 || + leftvt == VT_I1 || rightvt == VT_I1) + resvt = VT_I4; + else if ((leftvt == VT_UI1 && rightvt == VT_UI1) || + (leftvt == VT_UI1 && rightvt == VT_NULL) || + (leftvt == VT_NULL && rightvt == VT_UI1)) + resvt = VT_UI1; + else if (leftvt == VT_EMPTY || rightvt == VT_EMPTY || + leftvt == VT_I2 || rightvt == VT_I2 || + leftvt == VT_UI1 || rightvt == VT_UI1) + resvt = VT_I2; + else if (leftvt == VT_BOOL || rightvt == VT_BOOL || + leftvt == VT_BSTR || rightvt == VT_BSTR) + resvt = VT_BOOL; + + VariantInit(&lv); + VariantInit(&rv); + + /* VT_NULL requires special handling for when the opposite + * variant is equal to something other than -1. + * (NULL Imp 0 = NULL, NULL Imp n = n) + */ + if (leftvt == VT_NULL) + { + VARIANT_BOOL b; + switch(rightvt) + { + case VT_I1: if (!V_I1(right)) resvt = VT_NULL; break; + case VT_UI1: if (!V_UI1(right)) resvt = VT_NULL; break; + case VT_I2: if (!V_I2(right)) resvt = VT_NULL; break; + case VT_UI2: if (!V_UI2(right)) resvt = VT_NULL; break; + case VT_I4: if (!V_I4(right)) resvt = VT_NULL; break; + case VT_UI4: if (!V_UI4(right)) resvt = VT_NULL; break; + case VT_I8: if (!V_I8(right)) resvt = VT_NULL; break; + case VT_UI8: if (!V_UI8(right)) resvt = VT_NULL; break; + case VT_INT: if (!V_INT(right)) resvt = VT_NULL; break; + case VT_UINT: if (!V_UINT(right)) resvt = VT_NULL; break; + case VT_BOOL: if (!V_BOOL(right)) resvt = VT_NULL; break; + case VT_R4: if (!V_R4(right)) resvt = VT_NULL; break; + case VT_R8: if (!V_R8(right)) resvt = VT_NULL; break; + case VT_DATE: if (!V_DATE(right)) resvt = VT_NULL; break; + case VT_CY: if (!V_CY(right).int64) resvt = VT_NULL; break; + case VT_DECIMAL: + if (!(DEC_HI32(&V_DECIMAL(right)) || DEC_LO64(&V_DECIMAL(right)))) + resvt = VT_NULL; + break; + case VT_BSTR: + hres = VarBoolFromStr(V_BSTR(right),LOCALE_USER_DEFAULT, VAR_LOCALBOOL, &b); + if (FAILED(hres)) goto VarImp_Exit; + else if (!b) + V_VT(result) = VT_NULL; + else + { + V_VT(result) = VT_BOOL; + V_BOOL(result) = b; + } + goto VarImp_Exit; + } + if (resvt == VT_NULL) + { + V_VT(result) = resvt; + goto VarImp_Exit; + } + else + { + hres = VariantChangeType(result,right,0,resvt); + goto VarImp_Exit; + } + } + + /* Special handling is required when NULL is the right variant. + * (-1 Imp NULL = NULL, n Imp NULL = n Imp 0) + */ + else if (rightvt == VT_NULL) + { + VARIANT_BOOL b; + switch(leftvt) + { + case VT_I1: if (V_I1(left) == -1) resvt = VT_NULL; break; + case VT_UI1: if (V_UI1(left) == 0xff) resvt = VT_NULL; break; + case VT_I2: if (V_I2(left) == -1) resvt = VT_NULL; break; + case VT_UI2: if (V_UI2(left) == 0xffff) resvt = VT_NULL; break; + case VT_INT: if (V_INT(left) == -1) resvt = VT_NULL; break; + case VT_UINT: if (V_UINT(left) == ~0u) resvt = VT_NULL; break; + case VT_I4: if (V_I4(left) == -1) resvt = VT_NULL; break; + case VT_UI4: if (V_UI4(left) == ~0u) resvt = VT_NULL; break; + case VT_I8: if (V_I8(left) == -1) resvt = VT_NULL; break; + case VT_UI8: if (V_UI8(left) == ~(ULONGLONG)0) resvt = VT_NULL; break; + case VT_BOOL: if (V_BOOL(left) == VARIANT_TRUE) resvt = VT_NULL; break; + case VT_R4: if (V_R4(left) == -1.0) resvt = VT_NULL; break; + case VT_R8: if (V_R8(left) == -1.0) resvt = VT_NULL; break; + case VT_CY: if (V_CY(left).int64 == -1) resvt = VT_NULL; break; + case VT_DECIMAL: + if (DEC_HI32(&V_DECIMAL(left)) == 0xffffffff) + resvt = VT_NULL; + break; + case VT_BSTR: + hres = VarBoolFromStr(V_BSTR(left),LOCALE_USER_DEFAULT, VAR_LOCALBOOL, &b); + if (FAILED(hres)) goto VarImp_Exit; + else if (b == VARIANT_TRUE) + resvt = VT_NULL; + } + if (resvt == VT_NULL) + { + V_VT(result) = resvt; + goto VarImp_Exit; + } + } + + hres = VariantCopy(&lv, left); + if (FAILED(hres)) goto VarImp_Exit; + + if (rightvt == VT_NULL) + V_VT(&rv) = resvt; + else + { + hres = VariantCopy(&rv, right); + if (FAILED(hres)) goto VarImp_Exit; + } + + if (V_VT(&lv) == VT_BSTR && + FAILED(VarR8FromStr(V_BSTR(&lv),LOCALE_USER_DEFAULT, 0, &d))) + hres = VariantChangeType(&lv,&lv,VARIANT_LOCALBOOL, VT_BOOL); + if (SUCCEEDED(hres) && V_VT(&lv) != resvt) + hres = VariantChangeType(&lv,&lv,0,resvt); + if (FAILED(hres)) goto VarImp_Exit; + + if (V_VT(&rv) == VT_BSTR && + FAILED(VarR8FromStr(V_BSTR(&rv),LOCALE_USER_DEFAULT, 0, &d))) + hres = VariantChangeType(&rv, &rv,VARIANT_LOCALBOOL, VT_BOOL); + if (SUCCEEDED(hres) && V_VT(&rv) != resvt) + hres = VariantChangeType(&rv, &rv, 0, resvt); + if (FAILED(hres)) goto VarImp_Exit; + + /* do the math */ + V_VT(result) = resvt; + switch (resvt) + { + case VT_I8: + V_I8(result) = (~V_I8(&lv)) | V_I8(&rv); + break; + case VT_I4: + V_I4(result) = (~V_I4(&lv)) | V_I4(&rv); + break; + case VT_I2: + V_I2(result) = (~V_I2(&lv)) | V_I2(&rv); + break; + case VT_UI1: + V_UI1(result) = (~V_UI1(&lv)) | V_UI1(&rv); + break; + case VT_BOOL: + V_BOOL(result) = (~V_BOOL(&lv)) | V_BOOL(&rv); + break; + default: + FIXME("Couldn't perform bitwise implication on variant types %d,%d\n", + leftvt,rightvt); + } + +VarImp_Exit: + + VariantClear(&lv); + VariantClear(&rv); + + return hres; +}

1 0

Stefan Leichter : dmime: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 7262a86ceb4a4c96b801d648d1f66163c4990937 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7262a86ceb4a4c96b801d64… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Sep 20 22:25:51 2006 +0200 dmime: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmime/dmutils.c | 6 ++++-- dlls/dmime/lyricstrack.c | 9 ++++++--- dlls/dmime/markertrack.c | 9 ++++++--- dlls/dmime/paramcontroltrack.c | 9 ++++++--- dlls/dmime/performance.c | 18 +++++++++++------- dlls/dmime/segtriggertrack.c | 9 ++++++--- dlls/dmime/seqtrack.c | 9 ++++++--- dlls/dmime/sysextrack.c | 9 ++++++--- dlls/dmime/tempotrack.c | 9 ++++++--- dlls/dmime/timesigtrack.c | 9 ++++++--- dlls/dmime/tool.c | 2 +- dlls/dmime/wavetrack.c | 9 ++++++--- 12 files changed, 70 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7262a86ceb4a4c96b80…

1 0

Andrew Talbot : ole32: Cast-qual warnings fix.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: c9f97978909eb43ad635fc0b29383f759582d690 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9f97978909eb43ad635fc0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 20 22:03:08 2006 +0100 ole32: Cast-qual warnings fix. --- dlls/ole32/stg_prop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index e39a5d5..f0d144b 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1511,7 +1511,7 @@ static BOOL PropertyStorage_DictionaryWr DWORD keyLen, pad = 0; StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, - (lstrlenW((LPWSTR)key) + 1) * sizeof(WCHAR)); + (lstrlenW((LPCWSTR)key) + 1) * sizeof(WCHAR)); c->hr = IStream_Write(This->stm, &keyLen, sizeof(keyLen), &count); if (FAILED(c->hr)) goto end; @@ -2521,12 +2521,12 @@ HRESULT WINAPI FmtIdToPropStgName(const lstrcpyW(str, szDocSummaryInfo); else { - BYTE *fmtptr; + const BYTE *fmtptr; WCHAR *pstr = str; ULONG bitsRemaining = BITS_PER_BYTE; *pstr++ = 5; - for (fmtptr = (BYTE *)rfmtid; fmtptr < (BYTE *)rfmtid + sizeof(FMTID); ) + for (fmtptr = (const BYTE *)rfmtid; fmtptr < (const BYTE *)rfmtid + sizeof(FMTID); ) { ULONG i = *fmtptr >> (BITS_PER_BYTE - bitsRemaining);

1 0

Andrew Talbot : odbc32: Cast-qual warning fix.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 278efe5f7a456fbc927d513e34503937c0a80238 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=278efe5f7a456fbc927d513… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 20 21:11:18 2006 +0100 odbc32: Cast-qual warning fix. --- dlls/odbc32/proxyodbc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index da3a0aa..1354d85 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -218,7 +218,7 @@ static void ODBC_ReplicateODBCInstToRegi NULL, NULL, NULL)) == ERROR_FILE_NOT_FOUND) { if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, - REG_SZ, (LPBYTE)"Installed", 10)) != ERROR_SUCCESS) + REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) { TRACE ("Error %ld replicating driver %s\n", reg_ret, desc);

1 0

Juan Lang : netapi32: Partially implement DsRoleGetPrimaryDomainInformation , and DsRoleFreeMemory.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: b44d713d2327148c2d1714afe68b8d537b4ac998 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b44d713d2327148c2d1714a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 20 12:24:37 2006 -0700 netapi32: Partially implement DsRoleGetPrimaryDomainInformation, and DsRoleFreeMemory. --- dlls/netapi32/ds.c | 57 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/netapi32/tests/ds.c | 2 +- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/ds.c b/dlls/netapi32/ds.c index 03a90e3..fbcd665 100644 --- a/dlls/netapi32/ds.c +++ b/dlls/netapi32/ds.c @@ -20,9 +20,13 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "dsrole.h" @@ -39,7 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ds); */ VOID WINAPI DsRoleFreeMemory(PVOID Buffer) { - FIXME("(%p) stub\n", Buffer); + TRACE("(%p)\n", Buffer); + HeapFree(GetProcessHeap(), 0, Buffer); } /************************************************************ @@ -59,6 +64,8 @@ DWORD WINAPI DsRoleGetPrimaryDomainInfor LPCWSTR lpServer, DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, PBYTE* Buffer) { + DWORD ret; + FIXME("(%p, %d, %p) stub\n", lpServer, InfoLevel, Buffer); /* Check some input parameters */ @@ -66,5 +73,51 @@ DWORD WINAPI DsRoleGetPrimaryDomainInfor if (!Buffer) return ERROR_INVALID_PARAMETER; if ((InfoLevel < DsRolePrimaryDomainInfoBasic) || (InfoLevel > DsRoleOperationState)) return ERROR_INVALID_PARAMETER; - return E_NOTIMPL; + switch (InfoLevel) + { + case DsRolePrimaryDomainInfoBasic: + { + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle; + PPOLICY_ACCOUNT_DOMAIN_INFO DomainInfo; + NTSTATUS NtStatus; + int logon_domain_sz; + DWORD size; + PDSROLE_PRIMARY_DOMAIN_INFO_BASIC basic; + + ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); + NtStatus = LsaOpenPolicy(NULL, &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle); + if (NtStatus != STATUS_SUCCESS) + { + ERR("LsaOpenPolicyFailed with NT status %lx\n", + LsaNtStatusToWinError(NtStatus)); + return ERROR_OUTOFMEMORY; + } + LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, (PVOID*)&DomainInfo); + logon_domain_sz = lstrlenW(DomainInfo->DomainName.Buffer) + 1; + LsaClose(PolicyHandle); + + size = sizeof(DSROLE_PRIMARY_DOMAIN_INFO_BASIC) + + logon_domain_sz * sizeof(WCHAR); + basic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (basic) + { + basic->MachineRole = DsRole_RoleStandaloneWorkstation; + basic->DomainNameFlat = (LPWSTR)((LPBYTE)basic + + sizeof(DSROLE_PRIMARY_DOMAIN_INFO_BASIC)); + lstrcpyW(basic->DomainNameFlat, DomainInfo->DomainName.Buffer); + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + *Buffer = (PBYTE)basic; + LsaFreeMemory(DomainInfo); + } + break; + default: + ret = ERROR_CALL_NOT_IMPLEMENTED; + } + return ret; } diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index f3b238f..870afb1 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -59,7 +59,7 @@ static void test_get(void) SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, (PBYTE *)&dpdi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } + ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); pDsRoleFreeMemory(&dpdi); SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Don't crash on freeing null chain engine.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 0624ba1b2e81795df579a0377eb993729836d289 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0624ba1b2e81795df579a03… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 20 11:49:48 2006 -0700 crypt32: Don't crash on freeing null chain engine. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 9e2db16..147535d 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -163,7 +163,7 @@ void WINAPI CertFreeCertificateChainEngi TRACE("(%p)\n", hChainEngine); - if (InterlockedDecrement(&engine->ref) == 0) + if (engine && InterlockedDecrement(&engine->ref) == 0) { CertCloseStore(engine->hWorld, 0); CertCloseStore(engine->hRoot, 0);

1 0

Alexandre Julliard : configure: Don' t display any messages when started from the makefile to rebuild config. status.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: e3bd111b87a831502d3a3f07ae154cb81570b920 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3bd111b87a831502d3a3f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 11:14:38 2006 +0200 configure: Don't display any messages when started from the makefile to rebuild config.status. --- configure | 5 +++++ configure.ac | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3838f92..e684b93 100755 --- a/configure +++ b/configure @@ -25406,6 +25406,11 @@ fi +if test "$no_create" = "yes" +then + exit 0 +fi + if test "$verbose" = "yes" then if test "$ac_cv_header_capi20_h" != "yes" -o "$ac_cv_header_linux_capi_h" != "yes" diff --git a/configure.ac b/configure.ac index 1acebdf..d8cb6f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1818,6 +1818,11 @@ AC_OUTPUT dnl **** Display messages about additional packages *** +if test "$no_create" = "yes" +then + exit 0 +fi + if test "$verbose" = "yes" then dnl **** libcapi20-dev devel package ***

1 0

Alexandre Julliard : configure: Escape newlines in DEPENDENCIES when using an old autoconf version.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 1333ac8d87288062c8b46f29b5ac60948c64f4bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1333ac8d87288062c8b46f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 21:46:49 2006 +0200 configure: Escape newlines in DEPENDENCIES when using an old autoconf version. --- configure.ac | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0c1322a..1acebdf 100644 --- a/configure.ac +++ b/configure.ac @@ -1457,7 +1457,19 @@ esac dnl **** Generate output files **** -AC_SUBST(DEPENDENCIES,"### Dependencies: +dnl autoconf versions before 2.59d need backslashes to escape newlines in subst variables +AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59d]), -1, +["### Dependencies:\\ +\\ +.INIT: Makefile\\ +.BEGIN: Makefile\\ +Makefile: dummy\\ + -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ +\\ +\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h)\\ +\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ +\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], +["### Dependencies: .INIT: Makefile .BEGIN: Makefile @@ -1466,7 +1478,7 @@ Makefile: dummy \$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) -\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)") +\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) AH_TOP([#define __WINE_CONFIG_H])

1 0