January 2010 - Wine-Commits

Jacek Caban : urlmon: Fixed accept_mimes leak in tests.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 04cfe6acf75b598474c59c09272d272473157583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cfe6acf75b598474c59c092… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 7 13:18:33 2010 +0100 urlmon: Fixed accept_mimes leak in tests. --- dlls/urlmon/tests/protocol.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index afaafcb..d54d00d 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1355,6 +1355,7 @@ static HRESULT WINAPI ProtocolEmul_Start(IInternetProtocol *iface, LPCWSTR szUrl "GetBindString(BINDSTRING_ACCEPT_MIMES) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d, expected 1\n", fetched); ok(!strcmp_ww(acc_mimeW, accept_mimes[0]), "unexpected mimes %s\n", wine_dbgstr_w(accept_mimes[0])); + CoTaskMemFree(accept_mimes[0]); hres = IInternetBindInfo_QueryInterface(pOIBindInfo, &IID_IServiceProvider, (void**)&service_provider);

1 0

Nikolay Sivov : oleaut32/tests: Fix some leaks in safearray tests.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 88472df473b0cb8a81fb03956c8fb48386054704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88472df473b0cb8a81fb03956… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 7 13:48:58 2010 +0300 oleaut32/tests: Fix some leaks in safearray tests. --- dlls/oleaut32/tests/safearray.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 439325d..29e8761 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1321,6 +1321,7 @@ static void test_SafeArrayCopyData(void) ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); + SafeArrayDestroy(sacopy); } SafeArrayDestroy(sa); @@ -1548,6 +1549,7 @@ static void test_SafeArrayCopy(void) hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + SafeArrayDestroy(sa2); SafeArrayDestroy(sa); } @@ -1652,6 +1654,7 @@ static void test_SafeArrayChangeTypeEx(void) hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_UI1); ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_UI1 returned %x\n", hres); SafeArrayDestroy(sa); + VariantClear(&v2); } /* NULL/EMPTY */

1 0

James Hawkins : cabinet: Fix several file list leaks in the extract tests.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 300cc0fea1ab3570a673c701c1f4662621968d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=300cc0fea1ab3570a673c701c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:27:05 2010 -0800 cabinet: Fix several file list leaks in the extract tests. --- dlls/cabinet/tests/extract.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index c0a0c92..76bd7b7 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -329,6 +329,26 @@ static BOOL check_list(struct FILELIST **node, const char *filename, BOOL do_ext return TRUE; } +static void free_file_node(struct FILELIST *node) +{ + HeapFree(GetProcessHeap(), 0, node->FileName); + HeapFree(GetProcessHeap(), 0, node); +} + +static void free_file_list(SESSION* session) +{ + struct FILELIST *next, *curr = session->FileList; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } + + session->FileList = NULL; +} + static void test_Extract(void) { SESSION session; @@ -370,6 +390,7 @@ static void test_Extract(void) ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); /* try fill file list operation */ ZeroMemory(&session, sizeof(SESSION)); @@ -454,7 +475,10 @@ static void test_Extract(void) ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); /* remove two of the files in the list */ + node = session.FileList->next; session.FileList->next = session.FileList->next->next; + free_file_node(node); + free_file_node(session.FileList->next->next); session.FileList->next->next = NULL; session.FilterList = NULL; CreateDirectoryA("dest", NULL); @@ -482,6 +506,7 @@ static void test_Extract(void) ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); session.Operation = EXTRACT_FILLFILELIST; session.FileList = NULL; @@ -564,6 +589,7 @@ static void test_Extract(void) ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); /* cabinet does not exist */ ZeroMemory(&session, sizeof(SESSION)); @@ -593,6 +619,7 @@ static void test_Extract(void) ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); + free_file_list(&session); /* first file exists */ createTestFile("dest\\a.txt"); @@ -631,6 +658,7 @@ static void test_Extract(void) ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); } ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); + free_file_list(&session); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\a.txt"); @@ -670,7 +698,8 @@ static void test_Extract(void) ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); - ok(check_list(&node, "a.txt", TRUE), "list entry wrong\n"); + ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n"); + free_file_list(&session); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\testdir\\c.txt");

1 0

Nikolay Sivov : shell32/shelllink: Fix some string buffers leaks.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 9a53cb52637f9856041eb70f17c1369004a5d8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a53cb52637f9856041eb70f1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 7 16:00:50 2010 +0300 shell32/shelllink: Fix some string buffers leaks. --- dlls/shell32/shelllink.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dd62a7..e304058 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -303,7 +303,10 @@ static ULONG ShellLink_Release( IShellLinkImpl *This ) HeapFree(GetProcessHeap(), 0, This->sArgs); HeapFree(GetProcessHeap(), 0, This->sWorkDir); HeapFree(GetProcessHeap(), 0, This->sDescription); - HeapFree(GetProcessHeap(),0,This->sPath); + HeapFree(GetProcessHeap(), 0, This->sPath); + HeapFree(GetProcessHeap(), 0, This->sPathRel); + HeapFree(GetProcessHeap(), 0, This->sProduct); + HeapFree(GetProcessHeap(), 0, This->sComponent); if (This->site) IUnknown_Release( This->site );

1 0

James Hawkins : setupapi: Refactor freeing the INF file into free_inf_file. Use this new function to free any remnants of the parsing on error.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: b116175d4a5f4e818643c0b66dc8c4943f71d8cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b116175d4a5f4e818643c0b66… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:26:52 2010 -0800 setupapi: Refactor freeing the INF file into free_inf_file. Use this new function to free any remnants of the parsing on error. --- dlls/setupapi/parser.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 37b900f..7f581bd 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -856,6 +856,19 @@ static const WCHAR *comment_state( struct parser *parser, const WCHAR *pos ) } +static void free_inf_file( struct inf_file *file ) +{ + unsigned int i; + + for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); + HeapFree( GetProcessHeap(), 0, file->filename ); + HeapFree( GetProcessHeap(), 0, file->sections ); + HeapFree( GetProcessHeap(), 0, file->fields ); + HeapFree( GetProcessHeap(), 0, file->strings ); + HeapFree( GetProcessHeap(), 0, file ); +} + + /* parse a complete buffer */ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCHAR *end, UINT *error_line ) @@ -1011,7 +1024,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, DWORD sty UnmapViewOfFile( buffer ); if (err) { - HeapFree( GetProcessHeap(), 0, file ); + free_inf_file( file ); SetLastError( err ); file = NULL; } @@ -1231,16 +1244,10 @@ HINF WINAPI SetupOpenMasterInf( VOID ) void WINAPI SetupCloseInfFile( HINF hinf ) { struct inf_file *file = hinf; - unsigned int i; if (!hinf || (hinf == INVALID_HANDLE_VALUE)) return; - for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); - HeapFree( GetProcessHeap(), 0, file->filename ); - HeapFree( GetProcessHeap(), 0, file->sections ); - HeapFree( GetProcessHeap(), 0, file->fields ); - HeapFree( GetProcessHeap(), 0, file->strings ); - HeapFree( GetProcessHeap(), 0, file ); + free_inf_file( file ); }

1 0

James Hawkins : wintrust: Fix a memory leak until our implementation is fixed.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: b2d1c3eeecac64d77243450ce9446e2115e4f30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d1c3eeecac64d77243450ce… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:26:57 2010 -0800 wintrust: Fix a memory leak until our implementation is fixed. --- dlls/wintrust/tests/crypt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 3e77814..a2e096a 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -515,6 +515,8 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); ok(error == ERROR_BAD_FORMAT, "got %u expected ERROR_BAD_FORMAT\n", GetLastError()); } + if (hcatinfo != NULL) + pCryptCATAdminReleaseCatalogContext(hcatadmin, hcatinfo, 0); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1);

1 0

Marcin Baczyński : winedbg: Remove superfluous void* cast.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 477117a03fe7a4b945e294d93d56178a43ea1623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477117a03fe7a4b945e294d93… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Jan 6 23:38:34 2010 +0100 winedbg: Remove superfluous void* cast. --- programs/winedbg/break.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e9f7148..ed382bc 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -60,7 +60,7 @@ void break_set_xpoints(BOOL set) size = 0; else size = bp[i].w.len + 1; - addr = (void*)memory_to_linear_addr(&bp[i].addr); + addr = memory_to_linear_addr(&bp[i].addr); if (set) ret = be_cpu->insert_Xpoint(dbg_curr_process->handle,

1 0

Marcin Baczyński : winedump: Remove superfluous void* cast.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 6a02e744b92e87b70611c40f42900c49898fef9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a02e744b92e87b70611c40f4… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Jan 6 23:38:30 2010 +0100 winedump: Remove superfluous void* cast. --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d00d2ea..2732662 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1425,7 +1425,7 @@ static void dump_symbol_table(void) numsym = PE_nt_headers->FileHeader.NumberOfSymbols; if (!PE_nt_headers->FileHeader.PointerToSymbolTable || !numsym) return; - sym = (const IMAGE_SYMBOL*)PRD(PE_nt_headers->FileHeader.PointerToSymbolTable, + sym = PRD(PE_nt_headers->FileHeader.PointerToSymbolTable, sizeof(*sym) * numsym); if (!sym) return; /* FIXME: no way to get strtable size */

1 0

Detlef Riekenberg : comdlg32: Remove unused code for the Button psh1.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: aa389201e5b16b454932db497e69613100c94ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa389201e5b16b454932db497… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 6 23:52:11 2010 +0100 comdlg32: Remove unused code for the Button psh1. --- dlls/comdlg32/printdlg.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 149694a..5bf776f 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1561,24 +1561,6 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, } break; -#if 0 - case psh1: /* Print Setup */ - { - PRINTDLG16 pdlg; - - if (!PrintStructures->dlg.lpPrintDlg16) { - FIXME("The 32bit print dialog does not have this button!?\n"); - break; - } - - memcpy(&pdlg,PrintStructures->dlg.lpPrintDlg16,sizeof(pdlg)); - pdlg.Flags |= PD_PRINTSETUP; - pdlg.hwndOwner = HWND_16(hDlg); - if (!PrintDlg16(&pdlg)) - break; - } - break; -#endif case psh2: /* Properties button */ { HANDLE hPrinter; @@ -1733,11 +1715,6 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, } break; - case psh1: /* Print Setup */ - { - ERR("psh1 is called from 16bit code only, we should not get here.\n"); - } - break; case psh2: /* Properties button */ { HANDLE hPrinter;

1 0

Marcin Baczyński : libport: Remove superfluous void* cast.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: bb9c9264c85fcb4a0309fde72d9ba3b99704cb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9c9264c85fcb4a0309fde72… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Jan 6 23:38:33 2010 +0100 libport: Remove superfluous void* cast. --- libs/port/getopt.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libs/port/getopt.c b/libs/port/getopt.c index 041bef0..eeb64a6 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -441,8 +441,7 @@ _getopt_initialize (argc, argv, optstring) int len = nonoption_flags_max_len = strlen (orig_str); if (nonoption_flags_max_len < argc) nonoption_flags_max_len = argc; - __getopt_nonoption_flags = - (char *) malloc (nonoption_flags_max_len); + __getopt_nonoption_flags = malloc (nonoption_flags_max_len); if (__getopt_nonoption_flags == NULL) nonoption_flags_max_len = -1; else

1 0