wine-commits September 2006

wine-commits@winehq.org

3 participants
651 discussions

Benjamin Arai : msi: Adds test to check if basic "JOIN" operator without " WHERE" clause returns the correct results.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: a35ff56580329de3a1dc2aa47029568550c23ba6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a35ff56580329de3a1dc2aa… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Sep 20 16:59:19 2006 -0700 msi: Adds test to check if basic "JOIN" operator without "WHERE" clause returns the correct results. --- dlls/msi/tests/db.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 400e920..d75d44e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1776,6 +1776,14 @@ struct join_res const CHAR two[MAX_PATH]; }; +struct join_res_4col +{ + const CHAR one[MAX_PATH]; + const CHAR two[MAX_PATH]; + const CHAR three[MAX_PATH]; + const CHAR four[MAX_PATH]; +}; + static const struct join_res join_res_first[] = { { "alveolar", "procerus" }, @@ -1824,6 +1832,16 @@ static const struct join_res join_res_se { "malar", "nasalis" }, }; +static const struct join_res_4col join_res_eighth[] = +{ + { "msvcp.dll", "msvcp.dll.01234", "msvcp.dll.01234", "abcdefgh" }, + { "msvcr.dll", "msvcr.dll.56789", "msvcp.dll.01234", "abcdefgh" }, + { "msvcp.dll", "msvcp.dll.01234", "msvcr.dll.56789", "ijklmnop" }, + { "msvcr.dll", "msvcr.dll.56789", "msvcr.dll.56789", "ijklmnop" }, + { "msvcp.dll", "msvcp.dll.01234", "single.dll.31415", "msvcp.dll" }, + { "msvcr.dll", "msvcr.dll.56789", "single.dll.31415", "msvcp.dll" }, +}; + static void test_join(void) { MSIHANDLE hdb, hview, hrec; @@ -2222,6 +2240,52 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + + query = "SELECT `StdDlls`.`File`, `Binary`.`Data` " + "FROM `StdDlls`, `Binary` "; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + } + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 2, "Expected 2 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].one ), + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_eighth[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].four ), + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_eighth[i].four, buf ); + + i++; + MsiCloseHandle(hrec); + } + + todo_wine + { + ok( i == 6, "Expected 6 rows, got %ld\n", i ); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

Benjamin Arai : oleaut32: Conformance test for function variant:VarImp.
by Alexandre Julliard 25 Sep '06

25 Sep '06

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 25 Sep '06

25 Sep '06

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 25 Sep '06

25 Sep '06

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 25 Sep '06

25 Sep '06

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 25 Sep '06

25 Sep '06

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 25 Sep '06

25 Sep '06

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 25 Sep '06

25 Sep '06

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

Juan Lang : crypt32: Test exporting key acquired through CryptAcquireCertificatePrivateKey.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: c33f0c555e95db754d7432a99ea6e666eec4f94e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c33f0c555e95db754d7432a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 20 12:01:33 2006 -0700 crypt32: Test exporting key acquired through CryptAcquireCertificatePrivateKey. --- dlls/crypt32/tests/cert.c | 69 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5c23607..d9749d5 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1715,12 +1715,27 @@ static const BYTE selfSignedCert[] = { 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, 0xa8, 0x76, 0x57, 0x92, 0x36 }; +static const BYTE exportedPublicKeyBlob[] = { +0x06,0x02,0x00,0x00,0x00,0xa4,0x00,0x00,0x52,0x53,0x41,0x31,0x00,0x02,0x00,0x00, +0x01,0x00,0x01,0x00,0x79,0x10,0x1c,0xd0,0x6b,0x10,0x18,0x30,0x94,0x61,0xdc,0x0e, +0xcb,0x96,0x4e,0x21,0x3f,0x79,0xcd,0xa9,0x17,0x62,0xbc,0xbb,0x61,0x4c,0xe0,0x75, +0x38,0x6c,0xf3,0xde,0x60,0x86,0x03,0x97,0x65,0xeb,0x1e,0x6b,0xdb,0x53,0x85,0xad, +0x68,0x21,0xf1,0x5d,0xe7,0x1f,0xe6,0x53,0xb4,0xbb,0x59,0x3e,0x14,0x27,0xb1,0x83, +0xa7,0x3a,0x54,0xe2 }; + +static const BYTE asnEncodedPublicKey[] = { +0x30,0x48,0x02,0x41,0x00,0xe2,0x54,0x3a,0xa7,0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb, +0xb4,0x53,0xe6,0x1f,0xe7,0x5d,0xf1,0x21,0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb, +0x65,0x97,0x03,0x86,0x60,0xde,0xf3,0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc,0x62, +0x17,0xa9,0xcd,0x79,0x3f,0x21,0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30,0x18,0x10, +0x6b,0xd0,0x1c,0x10,0x79,0x02,0x03,0x01,0x00,0x01 }; + static void testAcquireCertPrivateKey(void) { BOOL ret; PCCERT_CONTEXT cert; HCRYPTPROV csp; - DWORD keySpec; + DWORD size, keySpec; BOOL callerFree; CRYPT_KEY_PROV_INFO keyProvInfo; HCRYPTKEY key; @@ -1834,6 +1849,58 @@ static void testAcquireCertPrivateKey(vo CryptDestroyKey(key); } + /* Some sanity-checking on public key exporting */ + ret = CryptImportPublicKeyInfo(csp, X509_ASN_ENCODING, + &cert->pCertInfo->SubjectPublicKeyInfo, &key); + ok(ret, "CryptImportPublicKeyInfo failed: %08lx\n", GetLastError()); + if (ret) + { + ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, NULL, &size); + ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); + if (ret) + { + LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size), encodedKey; + + ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, buf, &size); + ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); + ok(size == sizeof(exportedPublicKeyBlob), "Unexpected size %ld\n", + size); + ok(!memcmp(buf, exportedPublicKeyBlob, size), "Unexpected value\n"); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, + buf, CRYPT_ENCODE_ALLOC_FLAG, NULL, &encodedKey, &size); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + ok(size == sizeof(asnEncodedPublicKey), "Unexpected size %ld\n", + size); + ok(!memcmp(encodedKey, asnEncodedPublicKey, size), + "Unexpected value\n"); + LocalFree(encodedKey); + } + HeapFree(GetProcessHeap(), 0, buf); + } + CryptDestroyKey(key); + } + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + NULL, 0, NULL, NULL, &size); + ok(ret, "CryptExportPublicKeyInfoEx failed: %08lx\n", GetLastError()); + if (ret) + { + PCERT_PUBLIC_KEY_INFO info = HeapAlloc(GetProcessHeap(), 0, size); + + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + NULL, 0, NULL, info, &size); + ok(ret, "CryptExportPublicKeyInfoEx failed: %08lx\n", GetLastError()); + if (ret) + { + ok(info->PublicKey.cbData == sizeof(asnEncodedPublicKey), + "Unexpected size %ld\n", info->PublicKey.cbData); + ok(!memcmp(info->PublicKey.pbData, asnEncodedPublicKey, + info->PublicKey.cbData), "Unexpected value\n"); + } + HeapFree(GetProcessHeap(), 0, info); + } + CryptReleaseContext(csp, 0); CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0

Juan Lang : crypt32: Test decoding a big CRL.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: c3702346bcc91c492765ae032668bf031c36d090 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3702346bcc91c492765ae0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 20 11:55:40 2006 -0700 crypt32: Test decoding a big CRL. --- dlls/crypt32/tests/encode.c | 527 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 527 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c3702346bcc91c49276…

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2006