March 2019 - Wine-commits - list.winehq.org

Brendan McGrath : msi: Set stale function pointers to NULL.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 00d9b82035cb51c3cf893f08b8df22c1ce159c95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00d9b82035cb51c3cf893f08… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Mon Nov 26 20:23:34 2018 +1100 msi: Set stale function pointers to NULL. A crash occurs during install of dotnet35 on a 64-bit prefix as when msi_destroy_assembly_caches is called, the mscoree library is unloaded but the function pointers are not set back to NULL. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 256ca317a2871c62ca121e49f29fc37a64b4fb64) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/assembly.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114..3ed815e 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -36,7 +36,6 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); @@ -52,6 +51,7 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); @@ -121,6 +121,9 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; pCreateAssemblyCacheNet40 = NULL; + pGetFileVersion = NULL; + pCreateAssemblyNameObject = NULL; + pCreateAssemblyEnum = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 );

1 0

Fabian Maurer : winealsa.drv: Don' t crash when getting NULL event from midi.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 94ae72aeac23e9f22b038f7eb2fb085e51b292e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ae72aeac23e9f22b038f7e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Nov 20 21:09:27 2018 +0100 winealsa.drv: Don't crash when getting NULL event from midi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46170 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 20e5920135476cc4e380823a694537fca7fdf7e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/midi.c | 226 +++++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94ae72aeac23e9f22b03…

1 0

Alex Henrie : advapi32: Fix memory leak in QueryServiceConfig2W (Coverity) .
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 5aa7d5ddfb2035ae92fdbbd5277b3bc5b7863781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa7d5ddfb2035ae92fdbbd5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 4 14:15:24 2018 -0700 advapi32: Fix memory leak in QueryServiceConfig2W (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c296a21cdb2957f43768bec6a05cb1b6fa478596) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/service.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index d43cd40..9838586 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1650,6 +1650,7 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe if (!needed) { + if (dwLevel == SERVICE_CONFIG_DESCRIPTION) heap_free(bufptr); SetLastError(ERROR_INVALID_ADDRESS); return FALSE; }

1 0

Ralf Habacker : explorer: Fix atom leaks caused by not releasing DDE interface.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 17c15aa183c63b627a3008320aaa35f0931e9f00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c15aa183c63b627a300832… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Tue Nov 27 10:37:43 2018 +0100 explorer: Fix atom leaks caused by not releasing DDE interface. Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ddb713653b329f72e4b91beffef60e72c8a61574) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a2d9e1a..fb72175 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -922,6 +922,7 @@ void manage_desktop( WCHAR *arg ) WCHAR *p = arg; const WCHAR *name = NULL; BOOL enable_shell = FALSE; + void (WINAPI *pShellDDEInit)( BOOL ) = NULL; /* get the rest of the command line (if any) */ while (*p && !is_whitespace(*p)) p++; @@ -993,7 +994,6 @@ void manage_desktop( WCHAR *arg ) if (graphics_driver) { HMODULE shell32; - void (WINAPI *pShellDDEInit)( BOOL ); if (using_root) enable_shell = FALSE; @@ -1035,6 +1035,8 @@ void manage_desktop( WCHAR *arg ) WINE_TRACE( "desktop message loop exiting for hwnd %p\n", hwnd ); } + if (pShellDDEInit) pShellDDEInit( FALSE ); + ExitProcess( 0 ); }

1 0

Nikolay Sivov : inetcomm: Fix a leak on DeleteProp() (Valgrind).
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 5211743a93baf60e8d5643f05aec822ca98a48f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5211743a93baf60e8d5643f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:43:25 2018 +0300 inetcomm: Fix a leak on DeleteProp() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 05f6769f24a6db40ac1ea3d60cdbc3ac9c5f2513) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/mimeole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0e186c..2b307e1 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -818,16 +818,21 @@ static void empty_param_list(struct list *list) } } +static void free_header(header_t *header) +{ + list_remove(&header->entry); + PropVariantClear(&header->value); + empty_param_list(&header->params); + heap_free(header); +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) { - list_remove(&header->entry); - PropVariantClear(&header->value); - empty_param_list(&header->params); - HeapFree(GetProcessHeap(), 0, header); + free_header(header); } } @@ -1231,8 +1236,7 @@ static HRESULT WINAPI MimeBody_DeleteProp( if(found) { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); + free_header(cursor); return S_OK; } }

1 0

Sven Baars : dsound: Fix a memory leak (Valgrind).
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 4530e6560110f9405ae2ae711416cd60ac1ee875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4530e6560110f9405ae2ae71… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Dec 17 21:28:00 2018 +0100 dsound: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b3b1033541286c249f1efe95643ea51383c81d0a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 8dd86e4..4e752be 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -480,6 +480,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, } if(count == 0){ + IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); return DS_OK; }

1 0

Sven Baars : gdiplus: Fix a memory leak (Valgrind).
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: bf85c2e70ae51d583d1b61ff04e804742114b5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf85c2e70ae51d583d1b61ff… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Dec 19 21:10:15 2018 +0100 gdiplus: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3d5036e31769b0400d6cea08460e7fdb1cbf3556) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f99b026..fb80f6f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1125,6 +1125,7 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle return InvalidParameter; for (i = 0; i < (*fontCollection)->count; i++) heap_free((*fontCollection)->FontFamilies[i]); + heap_free((*fontCollection)->FontFamilies); heap_free(*fontCollection); return Ok;

1 0

Daniel Lehman : gdi32: Fix memory leak (Valgrind).
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 04aa347c3a03c9602f0db518da64c4eea884fe86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04aa347c3a03c9602f0db518… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Dec 19 21:35:05 2018 -0800 gdi32: Fix memory leak (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3b8fde3f0840af271cd0c1db4501e4e8261c05a9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 0acb23f..a84be82 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1035,6 +1035,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, &dc->brush_org, rop ); free_clipped_rects( &clipped_rects ); } + free_dib_info( &src_dib ); if (tmp_rgn) DeleteObject( tmp_rgn ); return ret;

1 0

Andrey Gusev : d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 6a29471d041c3bbcbe5d0f7e31016dfac08f66d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a29471d041c3bbcbe5d0f7e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 30 22:41:49 2019 +0200 d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42078 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bf63a4c37e534d02b0eeebf91135d99b8ee4a88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 76a3916..dde8821 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)

1 0

Alistair Leslie-Hughes : user32: Don' t reset focus if current dialog is a child.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 14509ebdf7cdfe0d3c88e6da877ef3d9fbdc6bab URL: https://source.winehq.org/git/wine.git/?a=commit;h=14509ebdf7cdfe0d3c88e6da… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 14 04:00:43 2018 +0000 user32: Don't reset focus if current dialog is a child. The standard File Open Dialog creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d8a27a78dd83f52b26cf8b7711f3ea127c0b34f7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dialog.c | 5 +++- dlls/user32/tests/dialog.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index f6d4a86..858dad7 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f57271c..34d6331 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -874,6 +874,56 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, return FALSE; } +static INT_PTR CALLBACK EmptyProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + +static INT_PTR CALLBACK focusChildDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, + LPARAM lParam) +{ + static HWND hChildDlg; + + switch (uiMsg) + { + case WM_INITDIALOG: + { + RECT rectHwnd; + struct { + DLGTEMPLATE tmplate; + WORD menu,class,title; + } temp; + + SetFocus( GetDlgItem(hwnd, 200) ); + + GetClientRect(hwnd,&rectHwnd); + temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | DS_CONTROL | DS_3DLOOK; + temp.tmplate.dwExtendedStyle = 0; + temp.tmplate.cdit = 0; + temp.tmplate.x = 0; + temp.tmplate.y = 0; + temp.tmplate.cx = 0; + temp.tmplate.cy = 0; + temp.menu = temp.class = temp.title = 0; + + hChildDlg = CreateDialogIndirectParamA(g_hinst, &temp.tmplate, + hwnd, (DLGPROC)EmptyProcUserTemplate, 0); + ok(hChildDlg != 0, "Failed to create test dialog.\n"); + + return FALSE; + } + case WM_CLOSE: + DestroyWindow(hChildDlg); + return TRUE; + } + + return FALSE; +} + /* Helper for InitialFocusTest */ static const char * GetHwndString(HWND hw) { @@ -1060,6 +1110,29 @@ static void test_focus(void) DestroyWindow(hDlg); } + + /* Test 6: + * Select textbox's text on creation when WM_INITDIALOG creates a child dialog. */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND edit; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_3", (LPCSTR)RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusChildDlgWinProc, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + edit = GetDlgItem(hDlg, 200); + + ok(GetFocus() == edit, "Focus not set to edit, focus=%p, dialog=%p, edit=%p\n", + GetFocus(), hDlg, edit); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void)

1 0