December 2009 - Wine-commits

Hans Leidekker : msi/tests: Loosen check on kernel32 language version.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 3840de5b1e1798fadfae6a7133a200ad0283fd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3840de5b1e1798fadfae6a713… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:35 2009 +0100 msi/tests: Loosen check on kernel32 language version. --- dlls/msi/tests/msi.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 8da3499..e249965 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2517,8 +2517,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); @@ -2536,8 +2535,7 @@ static void test_MsiGetFileVersion(void) lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); /* check neither version nor language */ r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); @@ -2553,7 +2551,7 @@ static void test_MsiGetFileVersion(void) langsz = MAX_PATH; r = MsiGetFileVersionA(path, NULL, NULL, NULL, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf not big enough */ versz = 5; @@ -2571,7 +2569,7 @@ static void test_MsiGetFileVersion(void) ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(lang, langcheck, 2), "Expected first character of %s, got %s\n", langcheck, lang); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); HeapFree(GetProcessHeap(), 0, vercheck); HeapFree(GetProcessHeap(), 0, langcheck);

1 0

Hans Leidekker : usp10: Fix a memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7d3f37fcbd23e66c1822157173392573499a0f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f37fcbd23e66c182215717… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:58 2009 +0100 usp10: Fix a memory leak. Found by Valgrind. --- dlls/usp10/usp10.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index aefe6cc..523bd4f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -923,7 +923,9 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) TRACE("(%p)\n", pssa); if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; + invalid = analysis->invalid; + ScriptFreeCache((SCRIPT_CACHE *)&analysis->sc); for (i = 0; i < analysis->numItems; i++) {

1 0

Hans Leidekker : userenv/tests: Fix some memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 952cd1d36addff7b3c3cf5a4c7dbe47995dccfd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952cd1d36addff7b3c3cf5a4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:19:23 2009 +0100 userenv/tests: Fix some memory leaks. Found by Valgrind. --- dlls/userenv/tests/userenv.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 7c1228b..9003354 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -145,6 +145,7 @@ static void test_create_env(void) todo_wine expect_env(TRUE, r, common_vars[i].name); else expect_env(TRUE, r, common_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); } } @@ -164,6 +165,7 @@ static void test_create_env(void) todo_wine expect_env(TRUE, r, common_post_nt4_vars[i].name); else expect_env(TRUE, r, common_post_nt4_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); } } } @@ -178,17 +180,23 @@ static void test_create_env(void) todo_wine expect_env(TRUE, r, htok_vars[i].name); else expect_env(TRUE, r, htok_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); } } r = get_env(env[0], "WINE_XYZZY", &st); expect(FALSE, r); + r = get_env(env[1], "WINE_XYZZY", &st); expect(FALSE, r); + r = get_env(env[2], "WINE_XYZZY", &st); expect(TRUE, r); + if (r) HeapFree(GetProcessHeap(), 0, st); + r = get_env(env[3], "WINE_XYZZY", &st); expect(TRUE, r); + if (r) HeapFree(GetProcessHeap(), 0, st); } START_TEST(userenv)

1 0

Hans Leidekker : fusion: Fix some memory leaks.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 67963a76b4c3ac5faad5f106a66bc4b418041044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67963a76b4c3ac5faad5f106a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:54:38 2009 +0100 fusion: Fix some memory leaks. Found by Valgrind. --- dlls/fusion/asmname.c | 5 +++++ dlls/fusion/tests/asmenum.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 913674a..3c014ea 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -471,6 +471,11 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam done: HeapFree(GetProcessHeap(), 0, save); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, name->displayname); + HeapFree(GetProcessHeap(), 0, name->name); + } return hr; } diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 48f7b2a..cb6ea3d 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -209,6 +209,8 @@ static void test_CreateAssemblyEnum(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); ok(asmenum == (IAssemblyEnum *)0xdeadbeef, "Expected asmenum to be unchanged, got %p\n", asmenum); + + IAssemblyName_Release(asmname); } typedef struct _tagASMNAME

1 0

Hans Leidekker : netapi32/tests: Fix a memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: d81f9006ded3378ea346f4f1a5d300d6db975a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81f9006ded3378ea346f4f1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 10:09:39 2009 +0100 netapi32/tests: Fix a memory leak. Found by Valgrind. --- dlls/netapi32/tests/apibuf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 3400726..af4d39d 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -59,6 +59,8 @@ static void run_apibuf_tests(void) /* border reallocate cases */ ok(pNetApiBufferReallocate(0, 1500, &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n"); ok(p != NULL, "No memory got allocated\n"); + ok(pNetApiBufferFree(p) == NERR_Success, "NetApiBufferFree failed\n"); + ok(pNetApiBufferAllocate(1024, &p) == NERR_Success, "Memory not reserved\n"); ok(pNetApiBufferReallocate(p, 0, &p) == NERR_Success, "Not freed\n"); ok(p == NULL, "Pointer not cleared\n");

1 0

Hans Leidekker : ntdll/tests: Fix a memory leak.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 72e7e399d5eba9a265ac9936e5b05bd04c3e4eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e7e399d5eba9a265ac9936e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 10:32:03 2009 +0100 ntdll/tests: Fix a memory leak. Found by Valgrind. --- dlls/ntdll/tests/directory.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 60c0158..c16b461 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -43,6 +43,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING,LPCSTR); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); +static VOID (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen, LPCSTR src, DWORD srclen ); static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirection)( BOOLEAN enable ); @@ -221,6 +222,7 @@ static void test_NtQueryDirectoryFile(void) pNtClose(dirh); done: tear_down_attribute_test(testdirA); + pRtlFreeUnicodeString(&ntdirname); } static void test_redirection(void) @@ -281,6 +283,7 @@ START_TEST(directory) pRtlCreateUnicodeStringFromAsciiz = (void *)GetProcAddress(hntdll, "RtlCreateUnicodeStringFromAsciiz"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlMultiByteToUnicodeN = (void *)GetProcAddress(hntdll,"RtlMultiByteToUnicodeN"); pRtlWow64EnableFsRedirection = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirection"); pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirectionEx");

1 0

Maarten Lankhorst : include: Add some definitions to ks.h.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 796c33c53ea58551c1f83832582227d2622dd1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796c33c53ea58551c1f838325… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Dec 6 12:59:31 2009 +0100 include: Add some definitions to ks.h. --- include/ks.h | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/include/ks.h b/include/ks.h index e570faf..168357e 100644 --- a/include/ks.h +++ b/include/ks.h @@ -19,6 +19,48 @@ #ifndef _KS_ #define _KS_ -/* FIXME dummy placeholder for now */ +typedef union tagKSIDENTIFIER +{ + struct + { + GUID Set; + ULONG Id; + ULONG Flags; + } DUMMYSTRUCTNAME; + LONGLONG Alignment; +} KSIDENTIFIER; + +typedef KSIDENTIFIER KSPROPERTY, *PKSPROPERTY, KSMETHOD, *PKSMETHOD, KSEVENT, *PKSEVENT; + +typedef enum +{ + KSPIN_DATAFLOW_IN = 1, + KSPIN_DATAFLOW_OUT +} KSPIN_DATAFLOW, *PKSPIN_DATAFLOW; + +#define KSDATAFORMAT_BIT_TEMPORAL_COMPRESSION 0 +#define KSDATAFORMAT_BIT_ATTRIBUTES 1 +#define KSDATAFORMAT_TEMPORAL_COMPRESSION (1 << 0) +#define KSDATAFORMAT_ATTRIBUTES 1 (1 << 1) + +#define KSDATARANGE_BIT_ATTRIBUTES 1 +#define KSDATARANGE_BIT_REQUIRED_ATTRIBUTES 2 +#define KSDATARANGE_ATTRIBUTES (1 << 1) +#define KSDATARANGE_REQUIRED_ATTRIBUTES (1 << 2) + +typedef union unionKSDATAFORMAT +{ + struct + { + ULONG FormatSize; + ULONG Flags; + ULONG SampleSize; + ULONG Reserved; + GUID MajorFormat; + GUID SubFormat; + GUID Specifier; + } DUMMYSTRUCTNAME; + LONGLONG Alignment; +} KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; #endif /* _KS_ */

1 0

Maarten Lankhorst : include: Fix typo in audiopolicy.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7c2e09615cfa4ed86e06d9d4b62df30fbe757569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2e09615cfa4ed86e06d9d4b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 7 08:25:23 2009 +0100 include: Fix typo in audiopolicy. --- include/audiopolicy.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index 2344f91..1221a54 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -181,7 +181,7 @@ interface IAudioVolumeDuckNotification : IUnknown [in] LPCWSTR sessionID, [in] UINT32 countCommunicationSessions ); - HRESULT OnVolumeUndockNotification( + HRESULT OnVolumeUnduckNotification( [in] LPCWSTR sessionID ); };

1 0

Marcus Meissner : rpcrt4: Fixed array_compute_and_size_conformance on strings (Coverity).
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4c36f79964519e9160b11cc530ec745907ece6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c36f79964519e9160b11cc53… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 6 23:33:56 2009 +0100 rpcrt4: Fixed array_compute_and_size_conformance on strings (Coverity). --- dlls/rpcrt4/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8db45b8..4511164 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1778,7 +1778,7 @@ static inline void array_compute_and_size_conformance( break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: - if (pFormat[0] == RPC_FC_C_CSTRING) + if (fc == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((const char *)pMemory)); pStubMsg->ActualCount = strlen((const char *)pMemory)+1; @@ -1789,7 +1789,7 @@ static inline void array_compute_and_size_conformance( pStubMsg->ActualCount = strlenW((LPCWSTR)pMemory)+1; } - if (fc == RPC_FC_STRING_SIZED) + if (pFormat[1] == RPC_FC_STRING_SIZED) pFormat = ComputeConformance(pStubMsg, pMemory, pFormat + 2, 0); else pStubMsg->MaxCount = pStubMsg->ActualCount;

1 0

Vincent Povirk : gdiplus: Implement GdipCloneBitmapArea.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bf04d3fa6915145b5c797e75b41002da2d40cc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf04d3fa6915145b5c797e75b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 6 20:02:35 2009 -0600 gdiplus: Implement GdipCloneBitmapArea. --- dlls/gdiplus/image.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5b70918..22895c7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -607,17 +607,73 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%f,%f,%f,%f,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + BitmapData lockeddata_src, lockeddata_dst; + int i; + UINT row_size; + Rect area; + GpStatus stat; - return NotImplemented; + TRACE("(%f,%f,%f,%f,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + + if (!srcBitmap || !dstBitmap || srcBitmap->image.type != ImageTypeBitmap || + x < 0 || y < 0 || + x + width > srcBitmap->width || y + height > srcBitmap->height) + { + TRACE("<-- InvalidParameter\n"); + return InvalidParameter; + } + + if (format == PixelFormatDontCare) + format = srcBitmap->format; + + area.X = roundr(x); + area.Y = roundr(y); + area.Width = roundr(width); + area.Height = roundr(height); + + stat = GdipBitmapLockBits(srcBitmap, &area, ImageLockModeRead, format, + &lockeddata_src); + if (stat != Ok) return stat; + + stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, + 0, lockeddata_src.PixelFormat, NULL, dstBitmap); + if (stat == Ok) + { + stat = GdipBitmapLockBits(*dstBitmap, NULL, ImageLockModeWrite, + lockeddata_src.PixelFormat, &lockeddata_dst); + + if (stat == Ok) + { + /* copy the image data */ + row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; + for (i=0; i<lockeddata_src.Height; i++) + memcpy((BYTE*)lockeddata_dst.Scan0+lockeddata_dst.Stride*i, + (BYTE*)lockeddata_src.Scan0+lockeddata_src.Stride*i, + row_size); + + GdipBitmapUnlockBits(*dstBitmap, &lockeddata_dst); + } + + if (stat != Ok) + GdipDisposeImage((GpImage*)*dstBitmap); + } + + GdipBitmapUnlockBits(srcBitmap, &lockeddata_src); + + if (stat != Ok) + { + *dstBitmap = NULL; + } + + return stat; } GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%i,%i,%i,%i,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + TRACE("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); - return NotImplemented; + return GdipCloneBitmapArea(x, y, width, height, format, srcBitmap, dstBitmap); } GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage)

1 0