June 2014 - Wine-Commits - list.winehq.org

Nicolas Le Cam : winedbg: Remove unused variable.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 81a904e72911d86475aef9999e827343285ec48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a904e72911d86475aef9999… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Jun 2 00:21:11 2014 +0200 winedbg: Remove unused variable. --- programs/winedbg/be_x86_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 18032d4..8628025 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -347,7 +347,6 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) { BYTE ch; LONG delta; - short segment; unsigned op_size = 32, rex = 0; DWORD64 dst; @@ -383,7 +382,6 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) switch (f_reg(ch)) { case 0x02: - segment = dbg_context.SegCs; break; default: return FALSE; }

1 0

Michael Stefaniuc : dmusic: Lock/unlock the module only on creation/ destruction of the object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1a7c0a6a70b3b7f4d07c032796d5b0d05a55ada6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7c0a6a70b3b7f4d07c03279… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 20:12:31 2014 +0200 dmusic: Lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/collection.c | 9 ++++----- dlls/dmusic/download.c | 10 +++++----- dlls/dmusic/port.c | 6 ++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 3d09815..2c826f5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -92,8 +92,6 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - DMUSIC_LockModule(); - return ref; } @@ -104,10 +102,10 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -851,6 +849,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p obj->ref = 1; list_init (&obj->Instruments); + DMUSIC_LockModule(); hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index cc2b024..a88ec2c 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -52,8 +52,6 @@ static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -64,10 +62,10 @@ static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -102,5 +100,7 @@ HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; download->ref = 1; *ret_iface = download; + + DMUSIC_LockModule(); return S_OK; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9d42667..ad61ba5 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -70,8 +70,6 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOW TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -86,10 +84,9 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -123,6 +120,7 @@ static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDown object->ref = 1; *instrument = &object->IDirectMusicDownloadedInstrument_iface; + DMUSIC_LockModule(); return S_OK; }

1 0

Michael Stefaniuc : dmusic: Don' t leak memory on DirectMusicInstrument creation failure.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d67f35b9dce3c3656a7c32513d75fdec2c157aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67f35b9dce3c3656a7c32513… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:22:48 2014 +0200 dmusic: Don't leak memory on DirectMusicInstrument creation failure. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/instrument.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 9df3e0c..87b31c1 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -62,8 +62,6 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -83,10 +81,9 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i HeapFree(GetProcessHeap(), 0, This->articulations->connections); HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -125,16 +122,22 @@ static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Vtbl = /* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicInstrumentImpl* dminst; - + HRESULT hr; + dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl)); if (NULL == dminst) { *ppobj = NULL; return E_OUTOFMEMORY; } dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; - dminst->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, ppobj); + dminst->ref = 1; + + DMUSIC_LockModule(); + hr = IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, + ppobj); + IDirectMusicInstrument_Release(&dminst->IDirectMusicInstrument_iface); + + return hr; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)

1 0

Michael Stefaniuc : dmusic: Don' t leak memory on IReferenceClock creation failure.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 19eba06a2658d5abab32642071140414a0be18b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19eba06a2658d5abab3264207… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:14 2014 +0200 dmusic: Don't leak memory on IReferenceClock creation failure. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/clock.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 2a8cd09..46a035f 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -50,8 +50,6 @@ static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -62,10 +60,10 @@ static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -123,6 +121,7 @@ static const IReferenceClockVtbl ReferenceClock_Vtbl = { HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) { IReferenceClockImpl* clock; + HRESULT hr; TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); @@ -133,9 +132,13 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO } clock->IReferenceClock_iface.lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* Will be inited by QueryInterface */ + clock->ref = 1; clock->rtTime = 0; clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); - return IReferenceClockImpl_QueryInterface((IReferenceClock*)clock, riid, ret_iface); + DMUSIC_LockModule(); + hr = IReferenceClockImpl_QueryInterface(&clock->IReferenceClock_iface, riid, ret_iface); + IReferenceClockImpl_Release(&clock->IReferenceClock_iface); + + return hr; }

1 0

Michael Stefaniuc : dmusic: Simplify the creation of a DirectMusicBuffer object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 57eb95a2ea19d555435a5ab0eaa1976426d8c1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=57eb95a2ea19d555435a5ab0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:18:55 2014 +0200 dmusic: Simplify the creation of a DirectMusicBuffer object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/buffer.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 35cbd88..bd0ad1a 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -57,8 +57,6 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -72,10 +70,9 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -279,7 +276,6 @@ static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) { IDirectMusicBufferImpl* dmbuffer; - HRESULT hr; TRACE("(%p, %p)\n", desc, ret_iface); @@ -290,7 +286,7 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i return E_OUTOFMEMORY; dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; - dmbuffer->ref = 0; /* Will be inited by QueryInterface */ + dmbuffer->ref = 1; if (IsEqualGUID(&desc->guidBufferFormat, &GUID_NULL)) dmbuffer->format = KSDATAFORMAT_SUBTYPE_MIDI; @@ -304,12 +300,8 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i return E_OUTOFMEMORY; } - hr = IDirectMusicBufferImpl_QueryInterface((LPDIRECTMUSICBUFFER)dmbuffer, &IID_IDirectMusicBuffer, ret_iface); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, dmbuffer->data); - HeapFree(GetProcessHeap(), 0, dmbuffer); - } + DMUSIC_LockModule(); + *ret_iface = &dmbuffer->IDirectMusicBuffer_iface; - return hr; + return S_OK; }

1 0

Michael Stefaniuc : dmscript/tests: Test some IPersistStream methods of DMScriptTrack.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 19b6c4cfc77e05e4ea21de59096e02a9c3ee6d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b6c4cfc77e05e4ea21de590… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:09:20 2014 +0200 dmscript/tests: Test some IPersistStream methods of DMScriptTrack. --- dlls/dmscript/tests/dmscript.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 204cf7c..02fddc3 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -202,6 +202,37 @@ static void test_dmscript(void) while (IDirectMusicScript_Release(dms)); } +static void test_scripttrack(void) +{ + IDirectMusicTrack *dmt; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmt); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack_Release(dmt)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -215,6 +246,7 @@ START_TEST(dmscript) test_COM(); test_COM_scripttrack(); test_dmscript(); + test_scripttrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmloader/tests: Test some IPersistStream methods of DMContainer.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: f9e1551e5a2c7cd8d18891083e35e1489470e744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e1551e5a2c7cd8d18891083… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:05:38 2014 +0200 dmloader/tests: Test some IPersistStream methods of DMContainer. --- dlls/dmloader/tests/loader.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 28adba1..46a2b93 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -218,6 +218,37 @@ static void test_COM_container(void) while (IDirectMusicContainer_Release(dmc)); } +static void test_container(void) +{ + IDirectMusicContainer *dmc; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicContainer, (void**)&dmc); + ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicContainer), + "Expected class CLSID_DirectMusicContainer got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicContainer_Release(dmc)); +} + START_TEST(loader) { CoInitialize(NULL); @@ -232,5 +263,6 @@ START_TEST(loader) test_simple_playing(); test_COM(); test_COM_container(); + test_container(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript: Move a struct definition to the .c file that uses it.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: e1fab4a837e13dcebd76b35f364eb218d10dee7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1fab4a837e13dcebd76b35f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:03:53 2014 +0200 dmscript: Move a struct definition to the .c file that uses it. --- dlls/dmscript/dmscript_private.h | 23 ----------------------- dlls/dmscript/script.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 082ffa4..551e7b7 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -43,35 +43,12 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicScriptImpl IDirectMusicScriptImpl; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicScriptImpl implementation structure - */ -struct IDirectMusicScriptImpl { - IDirectMusicScript IDirectMusicScript_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicScriptImpl fields */ - IDirectMusicPerformance* pPerformance; - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_SCRIPT_HEADER* pHeader; - DMUS_IO_VERSION* pVersion; - WCHAR* pwzLanguage; - WCHAR* pwzSource; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmscript.dll */ diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 6b9be6f..50394bc 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -34,6 +34,19 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicScriptImpl implementation */ +typedef struct IDirectMusicScriptImpl { + IDirectMusicScript IDirectMusicScript_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + IDirectMusicPerformance *pPerformance; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_SCRIPT_HEADER *pHeader; + DMUS_IO_VERSION *pVersion; + WCHAR *pwzLanguage; + WCHAR *pwzSource; +} IDirectMusicScriptImpl; + static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface) { return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface);

1 0

Bruno Jesus : winspool.drv: Do not try to check the registry if opening the printer fails (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 27280661524d3f66741cb8e7c7b27a3b46eca542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27280661524d3f66741cb8e7c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 22:04:56 2014 -0300 winspool.drv: Do not try to check the registry if opening the printer fails (valgrind). --- dlls/winspool.drv/info.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e33b257..bfb22cb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2530,6 +2530,7 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, */ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) { + HKEY key; TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); @@ -2542,12 +2543,10 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); - if (*phPrinter) + if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) { - HKEY key; DWORD deleting = 0, size = sizeof( deleting ), type; DWORD status; - WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ); RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&deleting, &size ); WaitForSingleObject( init_mutex, INFINITE ); status = get_dword_from_reg( key, StatusW );

1 0

Bruno Jesus : wintrust/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: dbdb244d132727452d11e63904fb7ffb5f52fd3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdb244d132727452d11e6390… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 22:03:06 2014 -0300 wintrust/tests: Fix a memory leak (valgrind). --- dlls/wintrust/tests/softpub.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index f342936..b1ac8a3 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -222,6 +222,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) } else skip("CertCreateCertificateContext failed: %08x\n", GetLastError()); + funcs->pfnFree(data.pasSigners); } }

1 0