August 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : winedevice: Avoid memory leak when driver cannot be unloaded.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 09f9986ea1270ae43c9ff606592caf8c111259c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f9986ea1270ae43c9ff6065… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 13:50:34 2016 +0200 winedevice: Avoid memory leak when driver cannot be unloaded. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e1a38a4..5011e4f 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -478,7 +478,13 @@ static NTSTATUS create_driver( const WCHAR *driver_name ) static void wine_drivers_rb_destroy( struct wine_rb_entry *entry, void *context ) { - unload_driver( entry, TRUE ); + if (unload_driver( entry, TRUE ) != STATUS_SUCCESS) + { + struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + ObDereferenceObject( driver->driver_obj ); + CloseServiceHandle( (void *)driver->handle ); + HeapFree( GetProcessHeap(), 0, driver ); + } } static void WINAPI async_shutdown_drivers( PTP_CALLBACK_INSTANCE instance, void *context )

1 0

Hugh McMaster : regedit: Process registry input from stdin.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: d8fd4bde382f7bba9d876dab6275e9706b7e3c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fd4bde382f7bba9d876dab6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 29 12:06:08 2016 +0000 regedit: Process registry input from stdin. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c0a1eab..7b2ddaef 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -93,6 +93,7 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) case ACTION_ADD: { WCHAR *filename = argv[*i]; WCHAR hyphen[] = {'-',0}; + WCHAR *realname = NULL; FILE *reg_file; if (!strcmpW(filename, hyphen)) @@ -100,7 +101,6 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) else { int size; - WCHAR *realname = NULL; WCHAR rb_mode[] = {'r','b',0}; size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); @@ -124,12 +124,12 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) HeapFree(GetProcessHeap(), 0, realname); return; } - import_registry_file(reg_file); - if (realname) - { - HeapFree(GetProcessHeap(),0,realname); - fclose(reg_file); - } + } + import_registry_file(reg_file); + if (realname) + { + HeapFree(GetProcessHeap(), 0, realname); + fclose(reg_file); } break; }

1 0

Nikolay Sivov : oleaut32: Added proxy/stub for BindType.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 2bc66dc073f920add93fa75b6c0c85226604e91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc66dc073f920add93fa75b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 15:38:56 2016 +0300 oleaut32: Added proxy/stub for BindType. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 61c8cc2..da524c8 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1515,23 +1515,41 @@ HRESULT __RPC_STUB ITypeComp_Bind_Stub( HRESULT CALLBACK ITypeComp_BindType_Proxy( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - ITypeInfo** ppTInfo, - ITypeComp** ppTComp) + ITypeInfo **ti, + ITypeComp **typecomp) { - FIXME("not implemented\n"); - return E_FAIL; + HRESULT hr; + + TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), lHashVal, ti, typecomp); + + hr = ITypeComp_RemoteBindType_Proxy(This, name, lHashVal, ti); + if (hr == S_OK) + ITypeInfo_GetTypeComp(*ti, typecomp); + else if (typecomp) + *typecomp = NULL; + + return hr; } HRESULT __RPC_STUB ITypeComp_BindType_Stub( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - ITypeInfo** ppTInfo) + ITypeInfo **ti) { - FIXME("not implemented\n"); - return E_FAIL; + ITypeComp *typecomp = NULL; + HRESULT hr; + + TRACE("(%p, %s, %#x, %p)\n", This, debugstr_w(name), lHashVal, ti); + + hr = ITypeComp_BindType(This, name, lHashVal, ti, &typecomp); + + if (typecomp) + ITypeComp_Release(typecomp); + + return hr; } /* ITypeInfo */

1 0

Sebastian Lackner : shell32: Remove __SHFreeAndNil macro.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: d3cb5c24a5ebbc7dcfb181a56f0f55cf3d1a1c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cb5c24a5ebbc7dcfb181a56… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 14:07:22 2016 +0200 shell32: Remove __SHFreeAndNil macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 6 ------ dlls/shell32/shfldr_fs.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 4b8c7cb..8cd1318 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -156,12 +156,6 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } -#define __SHFreeAndNil(ptr) \ - {\ - SHFree(*ptr); \ - *ptr = NULL; \ - }; - static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) { int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index d8bcb4c..2f49eb2 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1482,9 +1482,15 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, pdump (ppfti->pidlTargetFolder); if (This->pidlRoot) - __SHFreeAndNil (&This->pidlRoot); /* free the old */ + { + SHFree(This->pidlRoot); + This->pidlRoot = NULL; + } if (This->sPathTarget) - __SHFreeAndNil (&This->sPathTarget); + { + SHFree(This->sPathTarget); + This->sPathTarget = NULL; + } /* * Root path and pidl

1 0

Sebastian Lackner : shell32: Remove some unused static inline functions.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: af468590f7d312d759e14dc704395f27cf58e769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af468590f7d312d759e14dc70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 14:06:57 2016 +0200 shell32: Remove some unused static inline functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 0178e10..4b8c7cb 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -161,24 +161,6 @@ static inline BOOL SHELL_OsIsUnicode(void) SHFree(*ptr); \ *ptr = NULL; \ }; -static inline void __SHCloneStrA(char ** target,const char * source) -{ - *target = SHAlloc(strlen(source)+1); - strcpy(*target, source); -} - -static inline void __SHCloneStrWtoA(char ** target, const WCHAR * source) -{ - int len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL, NULL); - *target = SHAlloc(len); - WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL); -} - -static inline void __SHCloneStrW(WCHAR ** target, const WCHAR * source) -{ - *target = SHAlloc( (lstrlenW(source)+1) * sizeof(WCHAR) ); - lstrcpyW(*target, source); -} static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) {

1 0

Bruno Jesus : msacm32: Handle invalid source length in acmStreamPrepareHeader.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: d4fd43c97117c9135f5b032e2cc8c899b4b91de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fd43c97117c9135f5b032e2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 28 04:07:29 2016 -0300 msacm32: Handle invalid source length in acmStreamPrepareHeader. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/stream.c | 5 +++++ dlls/msacm32/tests/msacm.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index b380b46..4b4976f 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -312,6 +312,11 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, WARN("invalid use of reserved parameter\n"); return MMSYSERR_INVALFLAG; } + if (pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { + WARN("source smaller than block align (%d < %d)\n", + pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); + return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM; + } /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 06e530b..5ec4717 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -591,14 +591,19 @@ static void test_prepareheader(void) hdr.cbDstLength = sizeof(pcm); mr = acmStreamPrepareHeader(has, &hdr, 0); -todo_wine ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr); hdr.cbSrcLength = src->wfx.nBlockAlign - 1; /* less than block align */ mr = acmStreamPrepareHeader(has, &hdr, 0); -todo_wine ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); + hdr.cbSrcLength = src->wfx.nBlockAlign + 1; /* more than block align */ + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + hdr.cbSrcLength = src->wfx.nBlockAlign; mr = acmStreamPrepareHeader(has, &hdr, 1); /* invalid use of reserved parameter */ ok(mr == MMSYSERR_INVALFLAG, "expected 0x0a, got 0x%x\n", mr); @@ -674,7 +679,6 @@ todo_wine hdr.pbDst = pcm; hdr.cbDstLength = -4; mr = acmStreamPrepareHeader(has, &hdr, 0); -todo_wine { ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); @@ -687,7 +691,7 @@ todo_wine { mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); -} + /* Less output space than required */ memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr);

1 0

Bruno Jesus : msacm32: Handle invalid use of reserved parameter in acmStreamPrepareHeader.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 61eda97fd583ee9794fe535626189247dea23549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61eda97fd583ee9794fe53562… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 28 04:07:28 2016 -0300 msacm32: Handle invalid use of reserved parameter in acmStreamPrepareHeader. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/stream.c | 10 ++++++---- dlls/msacm32/tests/msacm.c | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index bdfc3cc..b380b46 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -302,14 +302,16 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); - return MMSYSERR_INVALHANDLE; + return MMSYSERR_INVALHANDLE; } if (!pash || pash->cbStruct < sizeof(ACMSTREAMHEADER)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; + } + if (fdwPrepare) { + WARN("invalid use of reserved parameter\n"); + return MMSYSERR_INVALFLAG; } - if (fdwPrepare) - ret = MMSYSERR_INVALFLAG; /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 812a1bb..06e530b 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -601,7 +601,6 @@ todo_wine hdr.cbSrcLength = src->wfx.nBlockAlign; mr = acmStreamPrepareHeader(has, &hdr, 1); /* invalid use of reserved parameter */ -todo_wine ok(mr == MMSYSERR_INVALFLAG, "expected 0x0a, got 0x%x\n", mr); mr = acmStreamPrepareHeader(has, &hdr, 0);

1 0

Józef Kucia : dxgi: Update swapchain fullscreen state when state change is successful.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 7c5f60f2d8bf71a357f3823a55efea116ef055f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f60f2d8bf71a357f3823a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 28 22:30:53 2016 +0200 dxgi: Update swapchain fullscreen state when state change is successful. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 7b02b3e..a759885 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -229,17 +229,24 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenS } } - swapchain->fullscreen = fullscreen; - if (swapchain->target) - IDXGIOutput_Release(swapchain->target); - swapchain->target = target; - wined3d_mutex_lock(); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + swapchain->fullscreen = fullscreen; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + } + else + { + IDXGIOutput_Release(target); + } + return hr; }

1 0

Austin English : apphelp: Add SdbGetAppPatchDir stub.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 48091559b50c28b2a9fd9a6cbc390363d38d24b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48091559b50c28b2a9fd9a6cb… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 26 21:10:08 2016 -0500 apphelp: Add SdbGetAppPatchDir stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 64dcd87..0ff74aa 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -111,3 +111,9 @@ void WINAPI SdbCloseDatabase(PDB pdb) { FIXME("stub: %p\n", pdb); } + +void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) +{ + FIXME("stub: %p %p %d\n", hsdb, path, size); + if (size && path) *path = 0; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a658e5c..2b0e0c6 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -49,7 +49,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @ stub SdbGetDatabaseID @ stub SdbGetDatabaseInformation

1 0

Henri Verbeet : d3d8: Use wined3d_resource_map() in d3d8_vertexbuffer_Lock ().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 53b21e0e9cb23c2915c8ce7ff79af41e4cd10544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b21e0e9cb23c2915c8ce7ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:02 2016 +0200 d3d8: Use wined3d_resource_map() in d3d8_vertexbuffer_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index aa19314..4826fac 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -182,14 +182,20 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT BYTE **data, DWORD flags) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); + wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data; return hr; }

1 0