January 2011 - Wine-commits

Hans Leidekker : msi: Don' t ignore disabled components when resolving install states.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 34b9e4c20f1998320a6604e201f4bd09399352c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b9e4c20f1998320a6604e20… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 19 12:05:31 2011 +0100 msi: Don't ignore disabled components when resolving install states. Otherwise features are not published correctly. --- dlls/msi/action.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 725ea2f..8cf80bf 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1841,8 +1841,7 @@ static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { - if (!comp->Enabled || !comp->ComponentId) - continue; + if (!comp->ComponentId) continue; if (state != INSTALLSTATE_LOCAL && state != INSTALLSTATE_DEFAULT) comp->Installed = INSTALLSTATE_ABSENT; @@ -2037,8 +2036,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) /* features with components that have compressed files are made local */ LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { - if (!cl->component->Enabled) continue; - if (cl->component->ForceLocalState && feature->ActionRequest == INSTALLSTATE_SOURCE) { @@ -2051,8 +2048,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { component = cl->component; - if (!component->Enabled) continue; - switch (feature->ActionRequest) { case INSTALLSTATE_ABSENT: @@ -2083,8 +2078,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) { - if (!component->Enabled) continue; - /* check if it's local or source */ if (!(component->Attributes & msidbComponentAttributesOptional) && (component->hasLocalFeature || component->hasSourceFeature)) @@ -2123,8 +2116,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) { - if (!component->Enabled) continue; - if (component->ActionRequest == INSTALLSTATE_DEFAULT) { TRACE("%s was default, setting to local\n", debugstr_w(component->Component));

1 0

Hans Leidekker : msi: Downgrade a warning.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 3ada9f2c082bc1927fea3f08c59724568ac1b246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ada9f2c082bc1927fea3f08c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 19 12:05:52 2011 +0100 msi: Downgrade a warning. Unreferenced files are normal when applying a patch. --- dlls/msi/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9d0e01a..1205690 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -187,7 +187,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, f = get_loaded_file(package, file); if (!f) { - WARN("unknown file in cabinet (%s)\n", debugstr_w(file)); + TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); return FALSE; }

1 0

Eric Pouech : dbghelp, winedump: Added definition for S_FRAMEPROC_V2 symbol (CodeView).
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 67a55feeaf3dea6a6ea66e5ee161d762e88b64c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a55feeaf3dea6a6ea66e5ee… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 18 21:49:47 2011 +0100 dbghelp, winedump: Added definition for S_FRAMEPROC_V2 symbol (CodeView). --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 15 +++++++-------- tools/winedump/msc.c | 19 +++++++++---------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 91927b3..0c90b00 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1935,7 +1935,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root /* the symbols we can safely ignore for now */ case 0x112c: - case S_FUNCINFO_V2: + case S_FRAMEINFO_V2: case S_SECUCOOKIE_V3: case S_SECTINFO_V3: case S_SUBSECTINFO_V3: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 99734c7..e72bee5 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1568,15 +1568,14 @@ union codeview_symbol { short int len; short int id; - unsigned int unknown1; /* maybe size (of what ?) */ + unsigned int sz_frame; /* size of frame */ unsigned int unknown2; unsigned int unknown3; - unsigned int unknown4; /* maybe size (of what ?) */ - unsigned int unknown5; /* maybe address <offset and segment> (of what ?) */ - unsigned short unknown6; - unsigned short flags; - unsigned int unknown7; - } func_info_v2; + unsigned int sz_saved_regs; /* size of saved registers from callee */ + unsigned int eh_offset; /* offset for exception handler */ + unsigned short eh_sect; /* section for exception handler */ + unsigned int flags; + } frame_info_v2; }; #define S_COMPILAND_V1 0x0001 @@ -1630,7 +1629,7 @@ union codeview_symbol #define S_REGREL_V2 0x100d #define S_LTHREAD_V2 0x100e #define S_GTHREAD_V2 0x100f -#define S_FUNCINFO_V2 0x1012 +#define S_FRAMEINFO_V2 0x1012 #define S_COMPILAND_V2 0x1013 #define S_COMPILAND_V3 0x1101 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index c917309..5b276fb 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1101,16 +1101,15 @@ int codeview_dump_symbols(const void* root, unsigned long size) break; /* Additional function information */ - case S_FUNCINFO_V2: - printf("\tFunction info V2 unk1:%x unk2:%x unk3:%x unk4:%x unk5:%x unk6:%x flags:%04x unk7:%x\n", - sym->func_info_v2.unknown1, - sym->func_info_v2.unknown2, - sym->func_info_v2.unknown3, - sym->func_info_v2.unknown4, - sym->func_info_v2.unknown5, - sym->func_info_v2.unknown6, - sym->func_info_v2.flags, - sym->func_info_v2.unknown7); + case S_FRAMEINFO_V2: + printf("\tS-Frame-Info V2: frame-size:%x unk2:%x unk3:%x saved-regs-sz:%x eh(%04x:%08x) flags:%08x\n", + sym->frame_info_v2.sz_frame, + sym->frame_info_v2.unknown2, + sym->frame_info_v2.unknown3, + sym->frame_info_v2.sz_saved_regs, + sym->frame_info_v2.eh_sect, + sym->frame_info_v2.eh_offset, + sym->frame_info_v2.flags); break; case S_SECUCOOKIE_V3:

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3D3 iface.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 97f9b02a26342ee4b7f1ef04f3759a3de9fa0bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f9b02a26342ee4b7f1ef04f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:30:21 2011 +0100 ddraw: COM cleanup for the IDirect3D3 iface. --- dlls/ddraw/ddraw.c | 88 +++++++++++++++++++++++++++---------------- dlls/ddraw/ddraw_private.h | 7 +--- dlls/ddraw/device.c | 6 +- 3 files changed, 59 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97f9b02a26342ee4b7f1e…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3D7 iface.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 497944f2bd374939b930bff6f8b699f84fe4f20c URL: http://source.winehq.org/git/wine.git/?a=commit;h=497944f2bd374939b930bff6f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:32:36 2011 +0100 ddraw: COM cleanup for the IDirect3D7 iface. --- dlls/ddraw/ddraw.c | 57 ++++++++++++++++++++++++++----------------- dlls/ddraw/ddraw_private.h | 7 +---- dlls/ddraw/device.c | 4 +- dlls/ddraw/surface.c | 3 +- 4 files changed, 39 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=497944f2bd374939b930b…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDraw iface.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: a59347fcd26f1d38d9ddc1af5f77d8d027b70d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59347fcd26f1d38d9ddc1af5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:33:42 2011 +0100 ddraw: COM cleanup for the IDirectDraw iface. --- dlls/ddraw/ddraw.c | 130 ++++++++++++++++++++++++++++---------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 4 +- dlls/ddraw/surface.c | 2 +- 5 files changed, 87 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a59347fcd26f1d38d9ddc…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDraw2 iface.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 4202f09100552f52c3a1c2587d122d2ac73b80b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4202f09100552f52c3a1c2587… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:36:36 2011 +0100 ddraw: COM cleanup for the IDirectDraw2 iface. --- dlls/ddraw/ddraw.c | 114 ++++++++++++++++++++++++++++--------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 4 +- dlls/ddraw/surface.c | 2 +- 5 files changed, 79 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4202f09100552f52c3a1c…

1 0

Juan Lang : crypt32: Fix memory leaks when decoding fails (valgrind).
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: d51a7940bcd0796bd098238cf0bc7089f7348892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51a7940bcd0796bd098238cf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 18 10:29:58 2011 -0800 crypt32: Fix memory leaks when decoding fails (valgrind). --- dlls/crypt32/decode.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index dd0064d..cd9a2a1 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -759,6 +759,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, ptr += itemDecoded; } } + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, pvStructInfo); } } if (itemSizes != &itemSize) @@ -1655,6 +1657,8 @@ static BOOL WINAPI CRYPT_AsnDecodeNameValue(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeNameValueInternal( pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, pcbStructInfo, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, value); } } } @@ -1836,6 +1840,8 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeNameValue(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeUnicodeNameValueInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, pcbStructInfo, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, value); } } } @@ -1930,6 +1936,8 @@ static BOOL WINAPI CRYPT_AsnDecodeName(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); } } } @@ -2025,6 +2033,8 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeName(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); } } } @@ -2685,6 +2695,8 @@ static BOOL WINAPI CRYPT_AsnDecodePolicyQualifierUserNotice( ret = CRYPT_AsnDecodePolicyQualifierUserNoticeInternal( pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, notice); } } } @@ -2774,6 +2786,8 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttribute(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodePKCSAttributeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, attr); } } } @@ -2909,6 +2923,8 @@ static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodePubKeyInfoInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); } } } @@ -3335,6 +3351,8 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodePKCSContentInfoInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, pcbStructInfo, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); } } } @@ -3404,6 +3422,8 @@ static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeAltNameInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, name); } } } @@ -3992,6 +4012,8 @@ static BOOL WINAPI CRYPT_AsnDecodeOctets(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeOctetsInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, blob); } } } @@ -4099,6 +4121,8 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeBitsInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, blob); } } } @@ -4189,6 +4213,8 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, pvStructInfo); } } } @@ -4280,6 +4306,8 @@ static BOOL WINAPI CRYPT_AsnDecodeInteger(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, blob); } } } @@ -4379,6 +4407,8 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedInteger(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeUnsignedIntegerInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, blob); } } } @@ -4629,6 +4659,8 @@ static BOOL WINAPI CRYPT_AsnDecodeUtcTime(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeUtcTimeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, pvStructInfo); } } } @@ -4758,6 +4790,8 @@ static BOOL WINAPI CRYPT_AsnDecodeChoiceOfTime(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeChoiceOfTimeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, pvStructInfo); } } } @@ -4856,6 +4890,8 @@ static BOOL WINAPI CRYPT_AsnDecodeSequenceOfAny(DWORD dwCertEncodingType, i++; } } + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, seq); } } } @@ -5333,6 +5369,8 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodePKCSSignerInfoInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, pcbStructInfo, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); } } } @@ -5497,6 +5535,8 @@ static BOOL WINAPI CRYPT_AsnDecodeCMSSignerInfo(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeCMSSignerInfoInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, pcbStructInfo, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); } } } @@ -6012,9 +6052,13 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, pbEncoded, cbEncoded, dwFlags, NULL, pcbStructInfo); if (ret && (ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, *pcbStructInfo))) + { ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, *(BYTE **)pvStructInfo, pcbStructInfo); + if (!ret) + CRYPT_FreeSpace(pDecodePara, *(BYTE **)pvStructInfo); + } } else ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType,

1 0

Nikolay Sivov : oleaut32/tests: Fix a dead path in test (Valgrind).
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 9d15067c251565e27f25d16a7142bacb1a8a8d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d15067c251565e27f25d16a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 18 19:52:19 2011 +0300 oleaut32/tests: Fix a dead path in test (Valgrind). --- dlls/oleaut32/tests/safearray.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 7c16ef7..e653141 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -127,9 +127,11 @@ static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; - *size = 17; if (fail_GetSize) + { + *size = RECORD_SIZE_FAIL; return E_UNEXPECTED; + } *size = RECORD_SIZE; return S_OK; } @@ -846,7 +848,10 @@ static void test_VectorCreateLockDestroy(void) int element; if (!pSafeArrayCreateVector) + { + win_skip("SafeArrayCreateVector not supported\n"); return; + } sa = pSafeArrayCreateVector(VT_UI1, 0, 0); ok(sa != NULL, "SACV with 0 elements failed.\n"); @@ -1256,7 +1261,10 @@ static void test_SafeArrayCopyData(void) int dimension,size=1; if (!pSafeArrayCopyData) + { + win_skip("SafeArrayCopyData not supported\n"); return; + } for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) { @@ -1342,7 +1350,10 @@ static void test_SafeArrayCreateEx(void) int dimension; if (!pSafeArrayCreateEx) + { + win_skip("SafeArrayCreateEx not supported\n"); return; + } for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) { @@ -1467,6 +1478,8 @@ static void test_SafeArrayCreateEx(void) ok(iRec->clearCalled == sab[0].cElements, "Destroy->Clear called %d times\n", iRec->clearCalled); ok(iRec->ref == START_REF_COUNT, "Wrong iRec refcount %d\n", iRec->ref); } + else + SafeArrayDestroy(sa); } static void test_SafeArrayClear(void) @@ -1672,7 +1685,6 @@ static void test_SafeArrayChangeTypeEx(void) hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_EMPTY); ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1 returned %x\n", hres); VariantClear(&v); - } static void test_SafeArrayDestroyData (void) @@ -1724,6 +1736,7 @@ START_TEST(safearray) GETPTR(SafeArrayGetVartype); GETPTR(SafeArrayCreateEx); GETPTR(SafeArrayCreateVector); + GETPTR(SafeArrayGetRecordInfo); check_for_VT_INT_PTR(); test_safearray();

1 0

Nikolay Sivov : shell32/tests: Fix a PIDL leak in tests (Valgrind).
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: cc1dc2e69304f7cef00099cd97d9a53e74cbd4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1dc2e69304f7cef00099cd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 18 22:37:14 2011 +0300 shell32/tests: Fix a PIDL leak in tests (Valgrind). --- dlls/shell32/tests/shelllink.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f213221..f754efd 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -911,6 +911,7 @@ static void test_GetIconLocation(void) pidl = path_to_pidl(mypath); r = IShellLinkA_SetIDList(sl, pidl); ok(r == S_OK, "SetPath failed (0x%08x)\n", r); + pILFree(pidl); i = 0xdeadbeef; strcpy(buffer, "garbage");

1 0