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

Robert Shearman : rpcrt4: Support small fixed arrays in EmbeddedComplexSize .
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: a8531067c4af80a904ce2b6b6ed28cadb6f9ddcf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8531067c4af80a904ce2b6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:55 2006 +0100 rpcrt4: Support small fixed arrays in EmbeddedComplexSize. --- dlls/rpcrt4/ndr_marshall.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index fe4a248..179d933 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1651,6 +1651,7 @@ static unsigned long EmbeddedComplexSize case RPC_FC_PSTRUCT: case RPC_FC_CSTRUCT: case RPC_FC_BOGUS_STRUCT: + case RPC_FC_SMFARRAY: return *(const WORD*)&pFormat[2]; case RPC_FC_USER_MARSHAL: return *(const WORD*)&pFormat[4];

1 0

Robert Shearman : rpcrt4: Improve the stubs for RpcImpersonateClient and RpcRevertToSelf.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: ba9158e2e13e265818b22d2ab1f168dd42bb2976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba9158e2e13e265818b22d2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:46:07 2006 +0100 rpcrt4: Improve the stubs for RpcImpersonateClient and RpcRevertToSelf. --- dlls/rpcrt4/rpc_binding.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 7f5f14d..363ee90 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -893,6 +893,7 @@ RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_STATUS WINAPI RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle) { FIXME("(%p): stub\n", BindingHandle); + ImpersonateSelf(SecurityImpersonation); return RPC_S_OK; } @@ -958,6 +959,7 @@ ULONG RpcAuthInfo_Release(RpcAuthInfo *A RPC_STATUS WINAPI RpcRevertToSelf(void) { FIXME("stub\n"); + RevertToSelf(); return RPC_S_OK; }

1 0

Robert Shearman : rpcrt4: Set BufferMark before calling EmbeddedPointerMarshall, EmbeddedPointerUnmarshall or EmbeddedPointerMemorySize.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 5700fe8a61c1113a074f394e3fa2fea9c185398c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5700fe8a61c1113a074f394… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:46:03 2006 +0100 rpcrt4: Set BufferMark before calling EmbeddedPointerMarshall, EmbeddedPointerUnmarshall or EmbeddedPointerMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 179d933..ac8d52c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3555,7 +3555,9 @@ unsigned char * WINAPI NdrFixedArrayMar total_size = pLgFArrayFormat->total_size; pFormat = (unsigned char *)(pLgFArrayFormat + 1); } + memcpy(pStubMsg->Buffer, pMemory, total_size); + pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += total_size; pFormat = EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); @@ -3601,6 +3603,7 @@ unsigned char * WINAPI NdrFixedArrayUnm if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, total_size); memcpy(*ppMemory, pStubMsg->Buffer, total_size); + pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += total_size; pFormat = EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -3678,6 +3681,7 @@ unsigned long WINAPI NdrFixedArrayMemory total_size = pLgFArrayFormat->total_size; pFormat = (unsigned char *)(pLgFArrayFormat + 1); } + pStubMsg->BufferMark = pStubMsg->Buffer; pStubMsg->Buffer += total_size; pStubMsg->MemorySize += total_size;

1 0

Robert Shearman : msi: The szLogFile parameter of MsiEnableLogW is optional , so handle the case of it being NULL.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: c0596e0ae91ee942dac6c5a8891000093c9aa3ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0596e0ae91ee942dac6c5a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:50 2006 +0100 msi: The szLogFile parameter of MsiEnableLogW is optional, so handle the case of it being NULL. --- dlls/msi/msi.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f8bd963..7e4bae3 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -632,15 +632,20 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMod TRACE("%08lx %s %08lx\n", dwLogMode, debugstr_w(szLogFile), attributes); - lstrcpyW(gszLogFile,szLogFile); - if (!(attributes & INSTALLLOGATTRIBUTES_APPEND)) - DeleteFileW(szLogFile); - file = CreateFileW(szLogFile, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - CloseHandle(file); + if (szLogFile) + { + lstrcpyW(gszLogFile,szLogFile); + if (!(attributes & INSTALLLOGATTRIBUTES_APPEND)) + DeleteFileW(szLogFile); + file = CreateFileW(szLogFile, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); + else + ERR("Unable to enable log %s\n",debugstr_w(szLogFile)); + } else - ERR("Unable to enable log %s\n",debugstr_w(szLogFile)); + gszLogFile[0] = '\0'; return ERROR_SUCCESS; }

1 0

Robert Shearman : rpcrt4: Allocate memory based on MaxCount, not ActualCount in NdrConformantStringUnmarshall.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 4c4fc14fe90de4af295eefe2906258cfcb51981c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c4fc14fe90de4af295eefe… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:15 2006 +0100 rpcrt4: Allocate memory based on MaxCount, not ActualCount in NdrConformantStringUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1d751ac..fe4a248 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -650,7 +650,7 @@ unsigned long WINAPI NdrConformantString { unsigned long rslt = 0; - TRACE("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); + FIXME("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); assert(pStubMsg && pFormat); @@ -679,7 +679,7 @@ unsigned long WINAPI NdrConformantString unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { - ULONG size, esize, i; + ULONG bufsize, memsize, esize, i; TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n", pStubMsg, *ppMemory, pFormat, fMustAlloc); @@ -697,16 +697,17 @@ unsigned char *WINAPI NdrConformantStrin esize = 0; } - size = safe_multiply(esize, pStubMsg->ActualCount); + memsize = safe_multiply(esize, pStubMsg->MaxCount); + bufsize = safe_multiply(esize, pStubMsg->ActualCount); /* strings must always have null terminating bytes */ - if (size < esize) + if (bufsize < esize) { ERR("invalid string length of %ld\n", pStubMsg->ActualCount); RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; } - for (i = size - esize; i < size; i++) + for (i = bufsize - esize; i < bufsize; i++) if (pStubMsg->Buffer[i] != 0) { ERR("string not null-terminated at byte position %ld, data is 0x%x\n", @@ -716,11 +717,11 @@ unsigned char *WINAPI NdrConformantStrin } if (fMustAlloc || !*ppMemory) - *ppMemory = NdrAllocate(pStubMsg, size); + *ppMemory = NdrAllocate(pStubMsg, memsize); - memcpy(*ppMemory, pStubMsg->Buffer, size); + memcpy(*ppMemory, pStubMsg->Buffer, bufsize); - pStubMsg->Buffer += size; + pStubMsg->Buffer += bufsize; if (*pFormat == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((char*)*ppMemory));

1 0

Robert Shearman : rpcrt4: Add support for marshaling the FC_HYPER base type in complex types.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 98c26a81fece2afc901a95a465b3f8d919c52e50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98c26a81fece2afc901a95a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:24 2006 +0100 rpcrt4: Add support for marshaling the FC_HYPER base type in complex types. Change the FIXME messages to print out unrecognised format characters in hex rather than decimal. --- dlls/rpcrt4/ndr_marshall.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index e1adfa0..1d751ac 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1722,6 +1722,12 @@ static unsigned char * ComplexMarshall(P pStubMsg->Buffer += 4; pMemory += 4; break; + case RPC_FC_HYPER: + TRACE("longlong=%s <= %p\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory), pMemory); + memcpy(pStubMsg->Buffer, pMemory, 8); + pStubMsg->Buffer += 8; + pMemory += 8; + break; case RPC_FC_POINTER: TRACE("pointer=%p <= %p\n", *(unsigned char**)pMemory, pMemory); NdrPointerMarshall(pStubMsg, *(unsigned char**)pMemory, pPointer); @@ -1758,7 +1764,7 @@ static unsigned char * ComplexMarshall(P case RPC_FC_PAD: break; default: - FIXME("unhandled format %02x\n", *pFormat); + FIXME("unhandled format 0x%02x\n", *pFormat); } pFormat++; } @@ -1802,6 +1808,12 @@ static unsigned char * ComplexUnmarshall pStubMsg->Buffer += 4; pMemory += 4; break; + case RPC_FC_HYPER: + memcpy(pMemory, pStubMsg->Buffer, 8); + TRACE("longlong=%s => %p\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory), pMemory); + pStubMsg->Buffer += 8; + pMemory += 8; + break; case RPC_FC_POINTER: TRACE("pointer => %p\n", pMemory); NdrPointerUnmarshall(pStubMsg, (unsigned char**)pMemory, pPointer, TRUE); @@ -1877,6 +1889,10 @@ static unsigned char * ComplexBufferSize pStubMsg->BufferLength += 4; pMemory += 4; break; + case RPC_FC_HYPER: + pStubMsg->BufferLength += 8; + pMemory += 8; + break; case RPC_FC_POINTER: NdrPointerBufferSize(pStubMsg, *(unsigned char**)pMemory, pPointer); pPointer += 4; @@ -1911,7 +1927,7 @@ static unsigned char * ComplexBufferSize case RPC_FC_PAD: break; default: - FIXME("unhandled format %d\n", *pFormat); + FIXME("unhandled format 0x%02x\n", *pFormat); } pFormat++; } @@ -1946,6 +1962,9 @@ static unsigned char * ComplexFree(PMIDL case RPC_FC_ENUM32: pMemory += 4; break; + case RPC_FC_HYPER: + pMemory += 8; + break; case RPC_FC_POINTER: NdrPointerFree(pStubMsg, *(unsigned char**)pMemory, pPointer); pPointer += 4; @@ -1980,7 +1999,7 @@ static unsigned char * ComplexFree(PMIDL case RPC_FC_PAD: break; default: - FIXME("unhandled format %d\n", *pFormat); + FIXME("unhandled format 0x%02x\n", *pFormat); } pFormat++; } @@ -2015,6 +2034,10 @@ static unsigned long ComplexStructMemory size += 4; pStubMsg->Buffer += 4; break; + case RPC_FC_HYPER: + size += 8; + pStubMsg->Buffer += 8; + break; case RPC_FC_POINTER: size += 4; pStubMsg->Buffer += 4; @@ -2046,7 +2069,7 @@ static unsigned long ComplexStructMemory case RPC_FC_PAD: break; default: - FIXME("unhandled format %d\n", *pFormat); + FIXME("unhandled format 0x%02x\n", *pFormat); } pFormat++; }

1 0

Robert Shearman : uuid: Add IIDs and CLSIDs from xmldso.h.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 2334e18adabc129e07e514cdb647e0affa1b72b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2334e18adabc129e07e514c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:02 2006 +0100 uuid: Add IIDs and CLSIDs from xmldso.h. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 98cdffb..a933923 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -60,6 +60,7 @@ #include "mshtml.h" #include "mshtmhst.h" #include "richole.h" #include "xmldom.h" +#include "xmldso.h" #include "downloadmgr.h" #include "objsel.h" #include "hlink.h"

1 0

Robert Shearman : oleaut32: Initialize pRetVal in ITypeInfo:: Invoke before calling VariantCopyInd
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: eb885a750f0677cb2d50f4969862065962471431 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb885a750f0677cb2d50f49… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:30 2006 +0100 oleaut32: Initialize pRetVal in ITypeInfo::Invoke before calling VariantCopyInd as native doesn't assume that it doesn't contain valid data. --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 52aae92..3ba1b4e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5391,8 +5391,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke } if (pVarResult) + { + VariantInit(pVarResult); /* deref return value */ hres = VariantCopyInd(pVarResult, prgpvarg[i]); + } /* free data stored in varresult. Note that * VariantClear doesn't do what we want because we are

1 0

Mike McCormack : msi: Add a test case for MsiGetFileHash.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: a652e285171eb03d2d8b0d82f0747edadc625f4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a652e285171eb03d2d8b0d8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 18:21:29 2006 +0900 msi: Add a test case for MsiGetFileHash. --- dlls/msi/tests/msi.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 4334675..d6ddf02 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -25,6 +25,11 @@ #include <msiquery.h> #include "wine/test.h" +typedef struct test_MSIFILEHASHINFO { + ULONG dwFileHashInfoSize; + ULONG dwData[4]; +} test_MSIFILEHASHINFO, *test_PMSIFILEHASHINFO; + typedef INSTALLSTATE (WINAPI *fnMsiUseFeatureExA)(LPCSTR, LPCSTR ,DWORD, DWORD ); fnMsiUseFeatureExA pMsiUseFeatureExA; typedef UINT (WINAPI *fnMsiOpenPackageExA)(LPCSTR, DWORD, MSIHANDLE*); @@ -33,6 +38,8 @@ typedef UINT (WINAPI *fnMsiOpenPackageEx fnMsiOpenPackageExW pMsiOpenPackageExW; typedef INSTALLSTATE (WINAPI *fnMsiGetComponentPathA)(LPCSTR, LPCSTR, LPSTR, DWORD*); fnMsiGetComponentPathA pMsiGetComponentPathA; +typedef UINT (WINAPI *fnMsiGetFileHashA)(LPCSTR, DWORD, test_PMSIFILEHASHINFO); +fnMsiGetFileHashA pMsiGetFileHashA; static void test_usefeature(void) { @@ -125,6 +132,60 @@ static void test_getcomponentpath(void) ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); } +static void test_filehash(void) +{ + const char name[] = "msitest.bin"; + const char data[] = {'a','b','c'}; + HANDLE handle; + UINT r; + test_MSIFILEHASHINFO hash; + DWORD count = 0; + + if (!pMsiGetFileHashA) + return; + + DeleteFile(name); + + memset(&hash, 0, sizeof hash); + r = pMsiGetFileHashA(name, 0, &hash); + ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + + r = pMsiGetFileHashA(name, 0, NULL); + ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + + memset(&hash, 0, sizeof hash); + hash.dwFileHashInfoSize = sizeof hash; + r = pMsiGetFileHashA(name, 0, &hash); + ok( r == ERROR_FILE_NOT_FOUND, "wrong error %d\n", r); + + handle = CreateFile(name, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_ARCHIVE, NULL); + ok(handle != INVALID_HANDLE_VALUE, "failed to create file\n"); + + WriteFile(handle, data, sizeof data, &count, NULL); + CloseHandle(handle); + + memset(&hash, 0, sizeof hash); + r = pMsiGetFileHashA(name, 0, &hash); + ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + + memset(&hash, 0, sizeof hash); + hash.dwFileHashInfoSize = sizeof hash; + r = pMsiGetFileHashA(name, 1, &hash); + ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + + r = pMsiGetFileHashA(name, 0, &hash); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + ok(hash.dwFileHashInfoSize == sizeof hash, "hash size changed\n"); + ok(hash.dwData[0] == 0x98500190 && + hash.dwData[1] == 0xb04fd23c && + hash.dwData[2] == 0x7d3f96d6 && + hash.dwData[3] == 0x727fe128, "hash of abc incorrect\n"); + + DeleteFile(name); +} + START_TEST(msi) { HMODULE hmod = GetModuleHandle("msi.dll"); @@ -136,8 +197,11 @@ START_TEST(msi) GetProcAddress(hmod, "MsiOpenPackageExW"); pMsiGetComponentPathA = (fnMsiGetComponentPathA) GetProcAddress(hmod, "MsiGetComponentPathA" ); + pMsiGetFileHashA = (fnMsiGetFileHashA) + GetProcAddress(hmod, "MsiGetFileHashA" ); test_usefeature(); test_null(); test_getcomponentpath(); + test_filehash(); }

1 0

Robert Shearman : msxml3: Use general DLL registration framework to register CLSIDs and ProgID's.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 986b33d1718217e17bd08ed4a29dee8f95116605 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=986b33d1718217e17bd08ed… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 24 11:45:08 2006 +0100 msxml3: Use general DLL registration framework to register CLSIDs and ProgID's. --- dlls/msxml3/Makefile.in | 3 dlls/msxml3/main.c | 30 --- dlls/msxml3/regsvr.c | 525 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 527 insertions(+), 31 deletions(-) create mode 100644 dlls/msxml3/regsvr.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=986b33d1718217e17bd…

1 0