December 2009 - Wine-Commits

Hans Leidekker : usp10: Fix a memory leak.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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 Dec. 7, 2009

Dec. 7, 2009

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 : ntdll/tests: Fix a memory leak.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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: Fix typo in audiopolicy.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Hans Leidekker : wininet: Cleanup any existing cache file before creating a new one.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 4a22c88b3776e68ea8fc5b3c669be890b6e92204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a22c88b3776e68ea8fc5b3c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:00 2009 +0100 wininet: Cleanup any existing cache file before creating a new one. Otherwise we leak the file name and handle when a request is sent again. Found by Valgrind. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 024d5d8..6123c5f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3638,6 +3638,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, b = CreateUrlCacheEntryW(url, lpwhr->dwContentLength > 0 ? lpwhr->dwContentLength : 0, NULL, cacheFileName, 0); if(b) { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); + CloseHandle(lpwhr->hCacheFile); + lpwhr->lpszCacheFile = heap_strdupW(cacheFileName); lpwhr->hCacheFile = CreateFileW(lpwhr->lpszCacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Hans Leidekker : fusion: Fix some memory leaks.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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 Dec. 7, 2009

Dec. 7, 2009

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

Maarten Lankhorst : include: Add some definitions to ks.h.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Alexandre Julliard : gdi32: Avoid use of some 16-bit types.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 13608c8b18f1d85df81fb55a94d168447d77c060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13608c8b18f1d85df81fb55a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 5 11:53:37 2009 +0100 gdi32: Avoid use of some 16-bit types. --- dlls/gdi32/enhmetafile.c | 25 +++++++++---------- dlls/gdi32/metafile.c | 23 ++++++++--------- dlls/gdi32/mfdrv/graphics.c | 55 +++++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13608c8b18f1d85df81fb…

1 0

Alexandre Julliard : gdi32: Stop exporting the 16-bit print job functions.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: fc55cdcd591b347c5dc50835d1cf199072507bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc55cdcd591b347c5dc50835d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:34:46 2009 +0100 gdi32: Stop exporting the 16-bit print job functions. --- dlls/gdi32/Makefile.in | 4 ++-- dlls/gdi32/gdi32.spec | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 45bdad5..3202e73 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -47,14 +47,14 @@ C_SRCS = \ path.c \ pen.c \ printdrv.c \ - printdrv16.c \ region.c C_SRCS16 = \ bidi16.c \ env.c \ gdi16.c \ - metafile16.c + metafile16.c \ + printdrv16.c RC_SRCS = version.rc RC_SRCS16 = version16.rc diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index ebd9525..96faf06 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -513,13 +513,10 @@ ################################################################ # Wine extensions: Win16 functions that are needed by other dlls # -@ stdcall CloseJob16(long) @ stdcall GetDCHook(long ptr) -@ stdcall OpenJob16(str str long) @ stdcall SelectVisRgn(long long) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) -@ stdcall WriteSpool16(long ptr long) ################################################################ # Wine internal extensions

1 0