wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Michael Stefaniuc : shell32/tests: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: afe0ba175cc0507290a82cd97da5e0a141932533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe0ba175cc0507290a82cd97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:10:33 2016 +0200 shell32/tests: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/brsfolder.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 0ef5bb1..bf29d11 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -248,10 +248,8 @@ static void test_click_make_new_folder_button(void) shfileop.fFlags = FOF_NOCONFIRMATION|FOF_NOERRORUI|FOF_SILENT; SHFileOperationA(&shfileop); - if (pidl) - CoTaskMemFree(pidl); - if (test_folder_pidl) - CoTaskMemFree(test_folder_pidl); + CoTaskMemFree(pidl); + CoTaskMemFree(test_folder_pidl); test_folder_object->lpVtbl->Release(test_folder_object); CoUninitialize(); @@ -346,16 +344,12 @@ static void test_selection(void) /* test without flags */ bi.ulFlags = 0; pidl = SHBrowseForFolderA(&bi); - - if (pidl) - CoTaskMemFree(pidl); + CoTaskMemFree(pidl); /* test with flag */ bi.ulFlags = BIF_NEWDIALOGSTYLE; pidl = SHBrowseForFolderA(&bi); - - if (pidl) - CoTaskMemFree(pidl); + CoTaskMemFree(pidl); IShellFolder_Release(desktop_object);

1 0

Michael Stefaniuc : quartz: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: b5a7853b861c02f350935813b7503a28d38fa7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a7853b861c02f350935813b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:10:14 2016 +0200 quartz: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 7 ++----- dlls/quartz/filtermapper.c | 3 +-- dlls/quartz/mpegsplit.c | 3 +-- dlls/quartz/tests/filtermapper.c | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index eb9b223..7e29318 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -349,11 +349,8 @@ static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir { if (This->hvid) ICClose(This->hvid); - if (This->pBihIn) - CoTaskMemFree(This->pBihIn); - if (This->pBihOut) - CoTaskMemFree(This->pBihOut); - + CoTaskMemFree(This->pBihIn); + CoTaskMemFree(This->pBihOut); This->hvid = NULL; This->pBihIn = NULL; This->pBihOut = NULL; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 6564155..8a1fc3a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -609,8 +609,7 @@ static void FM2_DeleteRegFilter(REGFILTER2 * prf2) for (i = 0; i < prf2->u.s2.cPins2; i++) { UINT j; - if (prf2->u.s2.rgPins2[i].clsPinCategory) - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].clsPinCategory); + CoTaskMemFree((void*)prf2->u.s2.rgPins2[i].clsPinCategory); for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++) { diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 1fd8002..9b581e9 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -589,8 +589,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO if (FAILED(hr)) { - if (amt.pbFormat) - CoTaskMemFree(amt.pbFormat); + CoTaskMemFree(amt.pbFormat); ERR("Could not create pin for MPEG audio stream (%x)\n", hr); break; } diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 11b7d39..f044a31 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -528,8 +528,7 @@ static void test_parse_filter_data(void) ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); out: - if (pRegFilter) - CoTaskMemFree(pRegFilter); + CoTaskMemFree(pRegFilter); if (psa) { SafeArrayUnaccessData(psa);

1 0

Michael Stefaniuc : winetest: Remove redundant NULL checks before heap_free().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 69039f064adf537d1acd192c3ce606107e8886fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=69039f064adf537d1acd192c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:09:51 2016 +0200 winetest: Remove redundant NULL checks before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/send.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index d04b6e9..d421e8b 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -395,10 +395,8 @@ send_file_wininet (const char *name) } done: - if (buffers_in.lpcszHeader != NULL) - heap_free((void *) buffers_in.lpcszHeader); - if (str != NULL) - heap_free (str); + heap_free((void *)buffers_in.lpcszHeader); + heap_free(str); if (pInternetCloseHandle != NULL && request != NULL) pInternetCloseHandle (request); if (pInternetCloseHandle != NULL && connection != NULL)

1 0

Michael Stefaniuc : gdi32: Remove a redundant NULL check before HeapFree() .
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 0b96693f75b8220079de30af108a01fa6ce85cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b96693f75b8220079de30af1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 09:59:35 2016 +0200 gdi32: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 411a18a..fac100d 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -175,7 +175,7 @@ static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); UINT index; - if (physDev->emh) HeapFree( GetProcessHeap(), 0, physDev->emh ); + HeapFree( GetProcessHeap(), 0, physDev->emh ); for(index = 0; index < physDev->handles_size; index++) if(physDev->handles[index]) GDI_hdc_not_using_object(physDev->handles[index], dev->hdc);

1 0

Dmitry Timoshkov : user32: Properly handle invalid parameters in CharToOem [Buff]W and OemToChar[Buff]W.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 59ba31d1fc36d04f6e69db6533411a1c120329d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ba31d1fc36d04f6e69db653… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 8 05:12:11 2016 +0200 user32: Properly handle invalid parameters in CharToOem[Buff]W and OemToChar[Buff]W. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/lstr.c | 5 ++++- dlls/user32/tests/text.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 79a7b27..42e55c0 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -166,7 +166,7 @@ BOOL WINAPI CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) { - if ( !s || !d ) return TRUE; + if (!s || !d) return FALSE; WideCharToMultiByte( CP_OEMCP, 0, s, len, d, len, NULL, NULL ); return TRUE; } @@ -177,6 +177,7 @@ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) { + if (!s || !d) return FALSE; return CharToOemBuffW( s, d, lstrlenW( s ) + 1 ); } @@ -216,6 +217,7 @@ BOOL WINAPI OemToCharBuffA( LPCSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI OemToCharBuffW( LPCSTR s, LPWSTR d, DWORD len ) { + if (!s || !d) return FALSE; MultiByteToWideChar( CP_OEMCP, 0, s, len, d, len ); return TRUE; } @@ -226,6 +228,7 @@ BOOL WINAPI OemToCharBuffW( LPCSTR s, LPWSTR d, DWORD len ) */ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d ) { + if (!s || !d) return FALSE; return OemToCharBuffW( s, d, strlen( s ) + 1 ); } diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 172ab6e..bebf6a0 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -730,6 +730,8 @@ static void test_DrawState(void) static void test_CharToOem_OemToChar(void) { + static const WCHAR helloWorldW[] = {'H','e','l','l','o',' ','W','o','r','l','d',0}; + static const WCHAR emptyW[] = {0}; static const char helloWorld[] = "Hello World"; static const struct { @@ -771,6 +773,40 @@ static void test_CharToOem_OemToChar(void) ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); } + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + const char *expected = tests[i].ret ? helloWorld : ""; + const WCHAR *src = tests[i].src ? helloWorldW : NULL; + char buf[64], *dst = tests[i].dst ? buf : NULL; + + memset(buf, 0, sizeof(buf)); + ret = CharToOemW(src, dst); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); + + memset(buf, 0, sizeof(buf)); + ret = CharToOemBuffW(src, dst, sizeof(helloWorldW)/sizeof(WCHAR)); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); + } + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + const WCHAR *expected = tests[i].ret ? helloWorldW : emptyW; + const char *src = tests[i].src ? helloWorld : NULL; + WCHAR buf[64], *dst = tests[i].dst ? buf : NULL; + + memset(buf, 0, sizeof(buf)); + ret = OemToCharW(src, dst); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!lstrcmpW(buf, expected), "test %d: got '%s'\n", i, wine_dbgstr_w(buf)); + + memset(buf, 0, sizeof(buf)); + ret = OemToCharBuffW(src, dst, sizeof(helloWorld)); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!lstrcmpW(buf, expected), "test %d: got '%s'\n", i, wine_dbgstr_w(buf)); + } } START_TEST(text)

1 0

Dmitry Timoshkov : user32: Properly handle invalid parameters in CharToOem [Buff]A and OemToChar[Buff]A.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 80d655ca75eb697cd5e32af1a4c2ecd1847a6ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d655ca75eb697cd5e32af1a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 8 05:11:42 2016 +0200 user32: Properly handle invalid parameters in CharToOem[Buff]A and OemToChar[Buff]A. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/lstr.c | 7 ++++++- dlls/user32/tests/text.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index a56e21c..79a7b27 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -136,7 +136,7 @@ LPWSTR WINAPI CharPrevW(LPCWSTR start,LPCWSTR x) */ BOOL WINAPI CharToOemA( LPCSTR s, LPSTR d ) { - if ( !s || !d ) return TRUE; + if (!s || !d) return FALSE; return CharToOemBuffA( s, d, strlen( s ) + 1 ); } @@ -148,6 +148,8 @@ BOOL WINAPI CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len ) { WCHAR *bufW; + if (!s || !d) return FALSE; + bufW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); if( bufW ) { @@ -184,6 +186,7 @@ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) */ BOOL WINAPI OemToCharA( LPCSTR s, LPSTR d ) { + if (!s || !d) return FALSE; return OemToCharBuffA( s, d, strlen( s ) + 1 ); } @@ -195,6 +198,8 @@ BOOL WINAPI OemToCharBuffA( LPCSTR s, LPSTR d, DWORD len ) { WCHAR *bufW; + if (!s || !d) return FALSE; + bufW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); if( bufW ) { diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 8438f10..172ab6e 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -2,7 +2,7 @@ * DrawText tests * * Copyright (c) 2004 Zach Gorman - * Copyright 2007 Dmitry Timoshkov + * Copyright 2007,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -728,9 +728,55 @@ static void test_DrawState(void) DestroyWindow(hwnd); } +static void test_CharToOem_OemToChar(void) +{ + static const char helloWorld[] = "Hello World"; + static const struct + { + BOOL src, dst, ret; + } + tests[] = + { + { FALSE, FALSE, FALSE }, + { TRUE, FALSE, FALSE }, + { FALSE, TRUE, FALSE }, + { TRUE, TRUE, TRUE }, + }; + BOOL ret; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + const char *expected = tests[i].ret ? helloWorld : ""; + const char *src = tests[i].src ? helloWorld : NULL; + char buf[64], *dst = tests[i].dst ? buf : NULL; + + memset(buf, 0, sizeof(buf)); + ret = CharToOemA(src, dst); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); + + memset(buf, 0, sizeof(buf)); + ret = CharToOemBuffA(src, dst, sizeof(helloWorld)); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); + + memset(buf, 0, sizeof(buf)); + ret = OemToCharA(src, dst); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); + + memset(buf, 0, sizeof(buf)); + ret = OemToCharBuffA(src, dst, sizeof(helloWorld)); + ok(ret == tests[i].ret, "test %d: expected %d, got %d\n", i, tests[i].ret, ret); + ok(!strcmp(buf, expected), "test %d: got '%s'\n", i, buf); + } +} + START_TEST(text) { test_TabbedText(); test_DrawTextCalcRect(); test_DrawState(); + test_CharToOem_OemToChar(); }

1 0

Kirill Smirnov : winex11.drv: Fix an uninitialized variable (clang).
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 827f97c1ab87c11d38b31e21f593e4d99a954004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=827f97c1ab87c11d38b31e21f… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Fri Jul 8 01:50:19 2016 +0300 winex11.drv: Fix an uninitialized variable (clang). dst_bits structure is valid only if copy_image_bits() succeeded. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8d61a4b..80256dc 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1436,10 +1436,10 @@ static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, XPutImage( gdi_display, pixmap, gc, image, 0, 0, 0, 0, coords.width, coords.height ); XFreeGC( gdi_display, gc ); image->data = NULL; + if (dst_bits.free) dst_bits.free( &dst_bits ); } XDestroyImage( image ); - if (dst_bits.free) dst_bits.free( &dst_bits ); return ret; update_format:

1 0

Lauri Kenttä : comdlg32: Avoid repeated GlobalLock etc in filedlg.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: c851ecca2bc36a88aa6c099f2ad142406a8e6391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c851ecca2bc36a88aa6c099f2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 6 13:27:44 2016 +0300 comdlg32: Avoid repeated GlobalLock etc in filedlg. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a04e646..0fbb621 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -225,6 +225,7 @@ LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName); static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl); static UINT GetNumSelected( IDataObject *doSelected ); +static void COMCTL32_ReleaseStgMedium(STGMEDIUM medium); /* Shell memory allocation */ static void *MemAlloc(UINT size); @@ -3649,12 +3650,18 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) LPITEMIDLIST pidl; LPWSTR lpstrAllFiles, lpstrTmp; UINT nFiles = 0, nFileToOpen, nFileSelected, nAllFilesLength = 0, nThisFileLength, nAllFilesMaxLength; + STGMEDIUM medium; + LPIDA cida; + FORMATETC formatetc = get_def_format(); TRACE("\n"); fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); - /* Count how many files we have */ - nFileSelected = GetNumSelected( fodInfos->Shell.FOIDataObject ); + if (FAILED(IDataObject_GetData(fodInfos->Shell.FOIDataObject, &formatetc, &medium))) + return; + + cida = GlobalLock(medium.u.hGlobal); + nFileSelected = cida->cidl; /* Allocate a buffer */ nAllFilesMaxLength = MAX_PATH + 3; @@ -3665,7 +3672,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) /* Loop through the selection, handle only files (not folders) */ for (nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++) { - pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 ); + pidl = (LPITEMIDLIST)((LPBYTE)cida + cida->aoffset[nFileToOpen + 1]); if (pidl) { if (!IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl)) @@ -3686,7 +3693,6 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) lpstrAllFiles[nAllFilesLength++] = '"'; lpstrAllFiles[nAllFilesLength++] = ' '; } - COMDLG32_SHFree(pidl); } } @@ -3707,6 +3713,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) ret: HeapFree(GetProcessHeap(), 0, lpstrAllFiles); + COMCTL32_ReleaseStgMedium(medium); }

1 0

Lauri Kenttä : comdlg32: Avoid generating filenames twice in filedlg.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: f99da3f3a1a2ac7e312687d4e0d11e9f52c1acda URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99da3f3a1a2ac7e312687d4e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 6 13:27:43 2016 +0300 comdlg32: Avoid generating filenames twice in filedlg. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 110 ++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 64 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index b0402c0..a04e646 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3647,9 +3647,8 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) { FileOpenDlgInfos *fodInfos; LPITEMIDLIST pidl; - UINT nFiles = 0, nFileToOpen, nFileSelected, nLength = 0; - WCHAR lpstrTemp[MAX_PATH]; - LPWSTR lpstrAllFile, lpstrCurrFile; + LPWSTR lpstrAllFiles, lpstrTmp; + UINT nFiles = 0, nFileToOpen, nFileSelected, nAllFilesLength = 0, nThisFileLength, nAllFilesMaxLength; TRACE("\n"); fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); @@ -3657,74 +3656,57 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) /* Count how many files we have */ nFileSelected = GetNumSelected( fodInfos->Shell.FOIDataObject ); - /* calculate the string length, count files */ - if (nFileSelected >= 1) + /* Allocate a buffer */ + nAllFilesMaxLength = MAX_PATH + 3; + lpstrAllFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nAllFilesMaxLength * sizeof(WCHAR)); + if (!lpstrAllFiles) + goto ret; + + /* Loop through the selection, handle only files (not folders) */ + for (nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++) { - nLength += 3; /* first and last quotes, trailing \0 */ - for ( nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++ ) - { pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 ); - if (pidl) - { - /* get the total length of the selected file names */ - lpstrTemp[0] = '\0'; - GetName( fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER|SHGDN_FORPARSING, lpstrTemp ); - - if ( ! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl) ) /* Ignore folders */ - { - nLength += lstrlenW( lpstrTemp ) + 3; - nFiles++; - } - COMDLG32_SHFree( pidl ); - } - } + { + if (!IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl)) + { + if (nAllFilesLength + MAX_PATH + 3 > nAllFilesMaxLength) + { + nAllFilesMaxLength *= 2; + lpstrTmp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpstrAllFiles, nAllFilesMaxLength * sizeof(WCHAR)); + if (!lpstrTmp) + goto ret; + lpstrAllFiles = lpstrTmp; + } + nFiles += 1; + lpstrAllFiles[nAllFilesLength++] = '"'; + GetName(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, lpstrAllFiles + nAllFilesLength); + nThisFileLength = lstrlenW(lpstrAllFiles + nAllFilesLength); + nAllFilesLength += nThisFileLength; + lpstrAllFiles[nAllFilesLength++] = '"'; + lpstrAllFiles[nAllFilesLength++] = ' '; + } + COMDLG32_SHFree(pidl); + } } - /* allocate the buffer */ - if (nFiles <= 1) nLength = MAX_PATH; - lpstrAllFile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(WCHAR)); - - /* Generate the string for the edit control */ - if(nFiles >= 1) + if (nFiles != 0) { - lpstrCurrFile = lpstrAllFile; - for ( nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++ ) - { - pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 ); - - if (pidl) - { - /* get the file name */ - lpstrTemp[0] = '\0'; - GetName( fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER|SHGDN_FORPARSING, lpstrTemp ); - - if (! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl)) /* Ignore folders */ - { - if ( nFiles > 1) - { - *lpstrCurrFile++ = '\"'; - lstrcpyW( lpstrCurrFile, lpstrTemp ); - lpstrCurrFile += lstrlenW( lpstrTemp ); - *lpstrCurrFile++ = '\"'; - *lpstrCurrFile++ = ' '; - *lpstrCurrFile = 0; - } - else - { - lstrcpyW( lpstrAllFile, lpstrTemp ); - } - } - COMDLG32_SHFree( pidl ); - } - } - SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile ); - - /* Select the file name like Windows does */ - if (filename_is_edit( fodInfos )) - SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); + /* If there's only one file, use the name as-is without quotes */ + lpstrTmp = lpstrAllFiles; + if (nFiles == 1) + { + lpstrTmp += 1; + lpstrTmp[nThisFileLength] = 0; + } + SetWindowTextW(fodInfos->DlgInfos.hwndFileName, lpstrTmp); + /* Select the file name like Windows does */ + if (filename_is_edit(fodInfos)) + SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); } - HeapFree(GetProcessHeap(),0, lpstrAllFile ); + +ret: + HeapFree(GetProcessHeap(), 0, lpstrAllFiles); }

1 0

Lauri Kenttä : comdlg32: Init clipboard format only once in filedlg.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 86a993ea3c06a4c24ff45b98b35d3fced7bb6296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a993ea3c06a4c24ff45b98b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 6 13:27:42 2016 +0300 comdlg32: Init clipboard format only once in filedlg. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 282582b..b0402c0 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3620,6 +3620,25 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd) } /*********************************************************************** + * get_def_format + * + * Fill the FORMATETC used in the shell id list + */ +static FORMATETC get_def_format(void) +{ + static CLIPFORMAT cfFormat; + FORMATETC formatetc; + + if (!cfFormat) cfFormat = RegisterClipboardFormatA(CFSTR_SHELLIDLISTA); + formatetc.cfFormat = cfFormat; + formatetc.ptd = 0; + formatetc.dwAspect = DVASPECT_CONTENT; + formatetc.lindex = -1; + formatetc.tymed = TYMED_HGLOBAL; + return formatetc; +} + +/*********************************************************************** * FILEDLG95_FILENAME_FillFromSelection * * fills the edit box from the cached DataObject @@ -3766,15 +3785,6 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U return nFileCount; } -#define SETDefFormatEtc(fe,cf,med) \ -{ \ - (fe).cfFormat = cf;\ - (fe).dwAspect = DVASPECT_CONTENT; \ - (fe).ptd =NULL;\ - (fe).tymed = med;\ - (fe).lindex = -1;\ -}; - /* * DATAOBJECT Helper functions */ @@ -3808,16 +3818,13 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex) { STGMEDIUM medium; - FORMATETC formatetc; + FORMATETC formatetc = get_def_format(); LPITEMIDLIST pidl = NULL; TRACE("sv=%p index=%u\n", doSelected, nPidlIndex); if (!doSelected) return NULL; - - /* Set the FORMATETC structure*/ - SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLISTA), TYMED_HGLOBAL); /* Get the pidls from IDataObject */ if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium))) @@ -3842,15 +3849,12 @@ static UINT GetNumSelected( IDataObject *doSelected ) { UINT retVal = 0; STGMEDIUM medium; - FORMATETC formatetc; + FORMATETC formatetc = get_def_format(); TRACE("sv=%p\n", doSelected); if (!doSelected) return 0; - /* Set the FORMATETC structure*/ - SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLISTA), TYMED_HGLOBAL); - /* Get the pidls from IDataObject */ if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium))) {

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016