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

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

Bruno Jesus : usp10: Fix a memory leak in _ItemizeInternal (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3c16044410cd60d2423bc1319117081e017a5020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c16044410cd60d2423bc1319… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri May 30 00:00:11 2014 -0300 usp10: Fix a memory leak in _ItemizeInternal (valgrind). --- dlls/usp10/usp10.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0493487..14feb6d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1280,6 +1280,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, WORD layoutRTL = 0; BOOL forceLevels = FALSE; INT consumed = 0; + HRESULT res = E_OUTOFMEMORY; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -1374,10 +1375,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { levels = heap_alloc_zero(cInChars * sizeof(WORD)); if (!levels) - { - heap_free(scripts); - return E_OUTOFMEMORY; - } + goto nomemory; BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels); baselevel = levels[0]; @@ -1396,11 +1394,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) - { - heap_free(scripts); - heap_free(levels); - return E_OUTOFMEMORY; - } + goto nomemory; BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); /* We currently mis-level leading Diacriticals */ @@ -1580,7 +1574,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, index++; if (index+1 > cMaxItems) - return E_OUTOFMEMORY; + goto nomemory; if (strength) str = strength[cnt]; @@ -1616,7 +1610,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; + if (index + 1 > cMaxItems) goto nomemory; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); @@ -1626,10 +1620,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, /* Set SCRIPT_ITEM */ pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ + res = S_OK; +nomemory: heap_free(levels); heap_free(strength); heap_free(scripts); - return S_OK; + return res; } /***********************************************************************

1 0

Nicolas Le Cam : mshtml/tests: Remove unused variable.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b57a88482940d5adb2b65d1c103364e9909deeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57a88482940d5adb2b65d1c1… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jun 1 17:40:23 2014 +0200 mshtml/tests: Remove unused variable. --- dlls/mshtml/tests/events.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6755591..2f99699 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -88,7 +88,6 @@ DEFINE_EXPECT(iframe_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; -static BOOL xy_todo; static BOOL is_ie9plus; typedef struct { @@ -1638,8 +1637,6 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(invoke_onclick); } - xy_todo = TRUE; - SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); @@ -2757,7 +2754,6 @@ static void run_test(const char *str, testfunc_t test) MSG msg; HRESULT hres; - xy_todo = FALSE; doc = create_document(); if (!doc) return;

1 0

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

June 11, 2014

Module: wine Branch: master Commit: 096bfbd2143b07ca68441a7d8f722d38ce2dc3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096bfbd2143b07ca68441a7d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:21:33 2014 +0200 dmusic: Simplify the creation of a DirectMusic8 object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/dmusic.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 30f69cc..28be851 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -61,8 +61,6 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -78,10 +76,9 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -417,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return E_OUTOFMEMORY; dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->ref = 1; dmusic->pMasterClock = NULL; dmusic->ppPorts = NULL; dmusic->nrofports = 0; @@ -427,14 +424,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return ret; } - ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); - if (FAILED(ret)) { - IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); - HeapFree(GetProcessHeap(), 0, dmusic); - return ret; - } - create_system_ports_list(dmusic); - return S_OK; + DMUSIC_LockModule(); + ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); + IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface); + + return ret; }

1 0

Michael Stefaniuc : dmusic: Release the clock when destroying the IDirectMusic8 object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d82e2935e41da81bd9e5576046c362ea091d0fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82e2935e41da81bd9e557604… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:55 2014 +0200 dmusic: Release the clock when destroying the IDirectMusic8 object. --- dlls/dmusic/dmusic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 6c837f7..30f69cc 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -74,6 +74,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { + IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : dmime/tests: Test some IPersistStream methods of objects with DMObject.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1a3a6d008408558ab17636c4669bee220aa8adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3a6d008408558ab17636c46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:08:01 2014 +0200 dmime/tests: Test some IPersistStream methods of objects with DMObject. --- dlls/dmime/tests/dmime.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c1c2caa..1258d40 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -370,6 +370,99 @@ static void test_COM_track(void) } } +static void test_audiopathconfig(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &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_DirectMusicAudioPathConfig), + "Expected class CLSID_DirectMusicAudioPathConfig 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 (IDirectMusicObject_Release(dmo)); +} + +static void test_graph(void) +{ + IDirectMusicGraph *dmg; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void**)&dmg); + ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicGraph_QueryInterface(dmg, &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_DirectMusicGraph), + "Expected class CLSID_DirectMusicGraph 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 (IDirectMusicGraph_Release(dmg)); +} + +static void test_segment(void) +{ + IDirectMusicSegment *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void**)&dms); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicSegment_QueryInterface(dms, &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_DirectMusicSegment), + "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + 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 (IDirectMusicSegment_Release(dms)); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -386,6 +479,9 @@ START_TEST(dmime) test_COM_segment(); test_COM_segmentstate(); test_COM_track(); + test_audiopathconfig(); + test_graph(); + test_segment(); CoUninitialize(); }

1 0

Bruno Jesus : shlwapi: Avoid reading past the pointer in PathCreateFromUrlW (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 9dacce1b4e58ebfe33d317ecb7ac7719552a9894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dacce1b4e58ebfe33d317ecb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:57:51 2014 -0300 shlwapi: Avoid reading past the pointer in PathCreateFromUrlW (valgrind). --- dlls/shlwapi/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 080c243..01e3ae7 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3377,7 +3377,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, len = src - pszUrl; StrCpyNW(dst, pszUrl, len + 1); dst += len; - if (isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) + if (*src && isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) { /* 'Forget' to add a trailing '/', just like Windows */ src++;

1 0

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

June 11, 2014

Module: wine Branch: master Commit: 1f713cc56723cf3fbd520bf1c62b59bfd029204c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f713cc56723cf3fbd520bf1c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:44:03 2014 -0300 wininet/tests: Fix a memory leak (valgrind). --- dlls/wininet/tests/urlcache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 07800e0..35ef77d 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -99,6 +99,7 @@ static void test_find_url_cache_entriesA(void) ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); } static void test_GetUrlCacheEntryInfoExA(void)

1 0

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

June 11, 2014

Module: wine Branch: master Commit: 55f8233390a926b316c4a945436bc9296a5a090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f8233390a926b316c4a9454… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:16:09 2014 -0300 userenv/tests: Fix a memory leak (valgrind). --- dlls/userenv/tests/userenv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index b085d17..5647cf3 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -154,6 +154,7 @@ static void test_create_env(void) r = get_env(env[i], "SystemRoot", &st); ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st); expect(TRUE, r); + HeapFree(GetProcessHeap(), 0, st); } /* Test for common environment variables (NT4 and higher) */

1 0

Nikolay Sivov : wbemprox/tests: Fix some test failures on older XP versions.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: ba111c79e492f4c5cb3f071d6f4a25761c8de794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba111c79e492f4c5cb3f071d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:23:21 2014 +0400 wbemprox/tests: Fix some test failures on older XP versions. --- dlls/wbemprox/tests/services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index b36748e..8ab6e83 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -131,7 +131,7 @@ static void test_IWbemLocator(void) { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER }, - { path11W, S_OK }, + { path11W, S_OK, FALSE, WBEM_E_INVALID_PARAMETER }, { path12W, S_OK }, { path13W, S_OK }, { path14W, S_OK }, @@ -139,8 +139,8 @@ static void test_IWbemLocator(void) { path16W, S_OK }, { path17W, WBEM_E_INVALID_NAMESPACE }, { path18W, S_OK }, - { path19W, WBEM_E_INVALID_NAMESPACE }, - { path20W, WBEM_E_INVALID_NAMESPACE }, + { path19W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { path20W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path21W, S_OK }, { path22W, S_OK }, { path23W, WBEM_E_INVALID_NAMESPACE },

1 0

Bruno Jesus : wininet: Use a helper to send data and take care of EINTR.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1b8d8ef372cbb6b77e8c381ce4e08ac2025f768c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8d8ef372cbb6b77e8c381ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 21:20:14 2014 -0300 wininet: Use a helper to send data and take care of EINTR. --- dlls/wininet/ftp.c | 8 ++++---- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 837fcad..5576de9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1220,7 +1220,7 @@ static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD s ftp_file_t *lpwh = (ftp_file_t*) hdr; int res; - res = send(lpwh->nDataSocket, buffer, size, 0); + res = sock_send(lpwh->nDataSocket, buffer, size, 0); *written = res>0 ? res : 0; return res >= 0 ? ERROR_SUCCESS : sock_get_error(errno); @@ -2316,7 +2316,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags TRACE("Sending (%s) len(%d)\n", cmd, len); while ((nBytesSent < len) && (nRC != -1)) { - nRC = send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); + nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); if (nRC != -1) { nBytesSent += nRC; @@ -2683,7 +2683,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, TRACE("Sending (%s) len(%d)\n", buf, len); while((nBytesSent < len) && (nRC != -1)) { - nRC = send(nSocket, buf+nBytesSent, len - nBytesSent, 0); + nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); nBytesSent += nRC; } heap_free(buf); @@ -3263,7 +3263,7 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile) nLen = DATA_PACKET_SIZE < nBytesToSend ? DATA_PACKET_SIZE : nBytesToSend; - nRC = send(nDataSocket, lpszBuffer, nLen, 0); + nRC = sock_send(nDataSocket, lpszBuffer, nLen, 0); if (nRC != -1) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a641340..87369c6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -457,6 +457,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; +int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 074229e..595dd71 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -496,6 +496,17 @@ int sock_get_error( int err ) return err; } +int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static void set_socket_blocking(int socket, blocking_mode_t mode) { #if defined(__MINGW32__) || defined (_MSC_VER) @@ -546,7 +557,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); status = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -718,7 +729,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -736,7 +747,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, { if(!connection->secure) { - *sent = send(connection->socket, msg, len, flags); + *sent = sock_send(connection->socket, msg, len, flags); if (*sent == -1) return sock_get_error(errno); return ERROR_SUCCESS;

1 0

Nikolay Sivov : include: Added IImageList2 definition.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: bc4ceca951bab517acc124963683f08ef085a8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4ceca951bab517acc124963… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 9 08:45:01 2014 +0400 include: Added IImageList2 definition. --- include/commoncontrols.idl | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl index 6e00837..8cfcb56 100644 --- a/include/commoncontrols.idl +++ b/include/commoncontrols.idl @@ -66,9 +66,7 @@ cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, const UINT ILIF_ALPHA = 1; [ - object, - uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), - helpstring("Image List"), + uuid(46eb5926-582e-4017-9fdf-e8998daa0950), local ] interface IImageList : IUnknown @@ -200,15 +198,44 @@ interface IImageList : IUnknown } [ - uuid(BCADA15B-B428-420c-8D28-023590924C9F) + uuid(192b9d83-50fc-457b-90a0-2b82a8b5dae1), + local +] +interface IImageList2 : IImageList +{ + typedef struct tagIMAGELISTSTATS + { + DWORD cbSize; + INT cAlloc; + INT cUsed; + INT cStandby; + } IMAGELISTSTATS; + + HRESULT Resize(INT x_size, INT y_size); + HRESULT GetOriginalSize([in] INT image, [in] DWORD flags, [out] INT *cx, [out] INT *cy); + HRESULT SetOriginalSize([in] INT image, [in] INT cx, [in] INT cy); + HRESULT SetCallback([in, unique] IUnknown *callback); + HRESULT GetCallback([in] REFIID riid, [out, iid_is(riid)] void** ppv); + HRESULT ForceImagePresent([in] INT image, DWORD flags); + HRESULT DiscardImages([in] INT first_image, [in] INT last_image, [in] DWORD flags); + HRESULT PreloadImages([in] IMAGELISTDRAWPARAMS *params); + HRESULT GetStatistics([in, out] IMAGELISTSTATS *stats); + HRESULT Initialize([in] INT cx, [in] INT cy, [in] UINT flags, [in] INT initial, [in] INT grow); + HRESULT Replace2([in] INT i, [in] HBITMAP image, [in, unique] HBITMAP mask, [in, unique] IUnknown *unk, [in] DWORD flags); + HRESULT ReplaceFromImageList([in] INT i, [in] IImageList *imagelist, [in] INT src, [in, unique] IUnknown *unk, [in] DWORD flags); +} + +[ + uuid(bcada15B-b428-420c-8d28-023590924c9f) ] library CommonControlObjects { [ - uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + uuid(7c476ba2-02b1-48f4-8048-b24619ddc058) ] coclass ImageList { interface IImageList; + interface IImageList2; } }

1 0

Michael Müller : server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 9602fa7a9317f1bf856fe441dd0aeb7d0cbfa9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9602fa7a9317f1bf856fe441d… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:44:36 2014 +0200 server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist. --- dlls/kernel32/tests/pipe.c | 6 ++++++ server/named_pipe.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b192f96..f7c7531 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -60,6 +60,12 @@ static void test_CreateNamedPipe(int pipemode) trace("test_CreateNamedPipe starting in byte mode\n"); else trace("test_CreateNamedPipe starting in message mode\n"); + + /* Wait for non existing pipe */ + ret = WaitNamedPipeA(PIPENAME, 2000); + ok(ret == 0, "WaitNamedPipe returned %d for non existing pipe\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* Bad parameter checks */ hnp = CreateNamedPipeA("not a named pipe", PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, /* nMaxInstances */ 1, diff --git a/server/named_pipe.c b/server/named_pipe.c index 4c85104..4b23ba2 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -900,7 +900,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c name.len = (buffer->NameLength / sizeof(WCHAR)) * sizeof(WCHAR); if (!(pipe = (struct named_pipe *)find_object( device->pipes, &name, OBJ_CASE_INSENSITIVE ))) { - set_error( STATUS_PIPE_NOT_AVAILABLE ); + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return 0; } if (!(server = find_available_server( pipe )))

1 0

Vincent Povirk : ole32: Don't store file size in FileLockBytesImpl.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d32abd77266acf10a22213ded73b548710482427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32abd77266acf10a22213ded… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 27 14:14:45 2014 -0500 ole32: Don't store file size in FileLockBytesImpl. --- dlls/ole32/filelockbytes.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 9bd1163..52c1d26 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -49,7 +49,6 @@ typedef struct FileLockBytesImpl { ILockBytes ILockBytes_iface; LONG ref; - ULARGE_INTEGER filesize; HANDLE hfile; DWORD flProtect; LPWSTR pwcsName; @@ -108,8 +107,6 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN This->ILockBytes_iface.lpVtbl = &FileLockBytesImpl_Vtbl; This->ref = 1; This->hfile = hFile; - This->filesize.u.LowPart = GetFileSize(This->hfile, - &This->filesize.u.HighPart); This->flProtect = GetProtectMode(openFlags); if(pwcsName) { @@ -129,8 +126,6 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN else This->pwcsName = NULL; - TRACE("file len %u\n", This->filesize.u.LowPart); - *pLockBytes = &This->ILockBytes_iface; return S_OK; @@ -248,7 +243,6 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( ULONG* pcbWritten) /* [out] */ { FileLockBytesImpl* This = impl_from_ILockBytes(iface); - ULONG size_needed = ulOffset.u.LowPart + cb; ULONG bytes_left = cb; const BYTE *writePtr = pv; BOOL ret; @@ -266,14 +260,6 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( if (pcbWritten) *pcbWritten = 0; - if (size_needed > This->filesize.u.LowPart) - { - ULARGE_INTEGER newSize; - newSize.u.HighPart = 0; - newSize.u.LowPart = size_needed; - ILockBytes_SetSize(iface, newSize); - } - offset.QuadPart = ulOffset.QuadPart; ret = SetFilePointerEx(This->hfile, offset, NULL, FILE_BEGIN); @@ -316,10 +302,7 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE HRESULT hr = S_OK; LARGE_INTEGER newpos; - if (This->filesize.u.LowPart == newSize.u.LowPart) - return hr; - - TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); + TRACE("new size %u\n", newSize.u.LowPart); newpos.QuadPart = newSize.QuadPart; if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) @@ -327,7 +310,6 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE SetEndOfFile(This->hfile); } - This->filesize = newSize; return hr; } @@ -412,7 +394,8 @@ static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface, pstatstg->pwcsName = NULL; pstatstg->type = STGTY_LOCKBYTES; - pstatstg->cbSize = This->filesize; + + pstatstg->cbSize.u.LowPart = GetFileSize(This->hfile, &pstatstg->cbSize.u.HighPart); /* FIXME: If the implementation is exported, we'll need to set other fields. */ return S_OK;

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in npplugin.c.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: a0c2d641d435703f55a661df1c83b2e78d60f703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c2d641d435703f55a661df1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:30:12 2014 +0200 mshtml: Use get_elem_attr_value helper in npplugin.c. --- dlls/mshtml/npplugin.c | 60 ++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 0ce72ff..ca0d9fd 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -211,10 +211,11 @@ typedef struct _NPPluginFuncs { NPP_LostFocusPtr lostfocus; } NPPluginFuncs; -static nsIDOMElement *get_dom_element(NPP instance) +static nsIDOMHTMLElement *get_dom_element(NPP instance) { nsISupports *instance_unk = (nsISupports*)instance->ndata; nsIPluginInstance *plugin_instance; + nsIDOMHTMLElement *html_elem; nsIDOMElement *elem; nsresult nsres; @@ -231,17 +232,24 @@ static nsIDOMElement *get_dom_element(NPP instance) return NULL; } - return elem; + nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLElement, (void**)&html_elem); + nsIDOMElement_Release(elem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); + return NULL; + } + + return html_elem; } -static HTMLInnerWindow *get_elem_window(nsIDOMElement *elem) +static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem) { nsIDOMWindow *nswindow; nsIDOMDocument *nsdoc; HTMLOuterWindow *window; nsresult nsres; - nsres = nsIDOMElement_GetOwnerDocument(elem, &nsdoc); + nsres = nsIDOMHTMLElement_GetOwnerDocument(elem, &nsdoc); if(NS_FAILED(nsres)) return NULL; @@ -287,29 +295,22 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) return SUCCEEDED(hres); } -static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) +static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) { - nsAString attr_str, val_str; + const PRUnichar *val; + nsAString val_str; nsresult nsres; BOOL ret = FALSE; static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - nsAString_InitDepend(&attr_str, classidW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMElement_GetAttribute(elem, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value(elem, classidW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); if(*val) ret = parse_classid(val, clsid); - }else { - ERR("GetAttribute failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); return ret; } @@ -529,35 +530,28 @@ static void install_codebase(const WCHAR *url) WARN("FAILED: %08x\n", hres); } -static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) +static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) { - nsAString attr_str, val_str; BOOL is_on_list = FALSE; install_entry_t *iter; + const PRUnichar *val; + nsAString val_str; IUri *uri = NULL; nsresult nsres; HRESULT hres; static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - nsAString_InitDepend(&attr_str, codebaseW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMElement_GetAttribute(nselem, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); if(FAILED(hres)) uri = NULL; } - }else { - ERR("GetAttribute failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); if(!uri) return; @@ -599,7 +593,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) IUri_Release(uri); } -static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *nselem, CLSID *clsid) +static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; @@ -645,7 +639,7 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, INT16 argc, char **argn, char **argv, NPSavedData *saved) { - nsIDOMElement *nselem; + nsIDOMHTMLElement *nselem; HTMLInnerWindow *window; IUnknown *obj; CLSID clsid; @@ -662,7 +656,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I window = get_elem_window(nselem); if(!window) { ERR("Could not get element's window object\n"); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); return NPERR_GENERIC_ERROR; } @@ -671,7 +665,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I PluginHost *host; HRESULT hres; - hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); + hres = create_plugin_host(window->doc, (nsIDOMElement*)nselem, obj, &clsid, &host); IUnknown_Release(obj); if(SUCCEEDED(hres)) instance->pdata = host; @@ -681,7 +675,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I err = NPERR_GENERIC_ERROR; } - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); return err; }

1 0

Jacek Caban : mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 75a2e8c4f0f92c89b9079702feb5853b20ee2de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a2e8c4f0f92c89b9079702f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:58 2014 +0200 mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation. --- dlls/mshtml/htmlinput.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e6fb184..f5e086c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1334,29 +1334,10 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BSTR *p) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - nsAString for_str, val_str; - nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&for_str, forW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &for_str, &val_str); - nsAString_Finish(&for_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); - *p = SysAllocString(val); - hres = *p ? S_OK : E_OUTOFMEMORY; - }else { - ERR("GetAttribute failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&val_str); - return hres; + return elem_string_attr_getter(&This->element, forW, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v)

1 0

Bruno Jesus : winmm: Fix a memory leak in mciSendStringW (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c3a362a4c44dea29d1f59fc5805b9be385df75ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a362a4c44dea29d1f59fc58… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 20:53:19 2014 -0300 winmm: Fix a memory leak in mciSendStringW (valgrind). --- dlls/winmm/mci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 5c91045..10e2b40 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1316,7 +1316,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, UINT uRetLen, HWND hwndCallback) { - LPWSTR verb, dev, args; + LPWSTR verb, dev, args, devType = NULL; LPWINE_MCIDRIVER wmd = 0; MCIDEVICEID uDevID, auto_open = 0; DWORD dwFlags = 0, dwRet = 0; @@ -1360,7 +1360,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, /* Determine devType from open */ if (!strcmpW(verb, wszOpen)) { - LPWSTR devType, tmp; + LPWSTR tmp; WCHAR buf[128]; /* case dev == 'new' has to be handled */ @@ -1426,7 +1426,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCI_LoadMciDriver(devType, &wmd); if (dwRet == MCIERR_DEVICE_NOT_INSTALLED) dwRet = MCIERR_INVALID_DEVICE_NAME; - HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev))) @@ -1596,6 +1595,7 @@ errCleanUp: } if (wMsg == MCI_OPEN && LOWORD(dwRet) && wmd) MCI_UnLoadMciDriver(wmd); + HeapFree(GetProcessHeap(), 0, devType); HeapFree(GetProcessHeap(), 0, verb); return dwRet; }

1 0

Piotr Caban : user32: Try to activate topmost activable window in WINPOS_ActivateOtherWindow.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 7257b62bd1b95438c651716b48bf3d7438eb235a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7257b62bd1b95438c651716b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 28 12:57:47 2014 +0200 user32: Try to activate topmost activable window in WINPOS_ActivateOtherWindow. --- dlls/user32/tests/win.c | 5 +++++ dlls/user32/winpos.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cffceb3..cbcd6b6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3766,6 +3766,11 @@ static void test_SetParent(void) ok(bret, "SetForegroundWindow() failed\n"); check_active_state(popup, popup, popup); + ShowWindow(parent, SW_SHOW); + SetActiveWindow(popup); + ok(DestroyWindow(popup), "DestroyWindow() failed\n"); + check_active_state(parent, parent, parent); + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); ok(!IsWindow(parent), "parent still exists\n"); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 57fefe3..0a70942 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1536,7 +1536,19 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) for (;;) { if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; - if (can_activate_window( hwndTo )) break; + if (can_activate_window( hwndTo )) goto done; + } + + hwndTo = GetTopWindow( 0 ); + for (;;) + { + if (hwndTo == hwnd) + { + hwndTo = 0; + break; + } + if (can_activate_window( hwndTo )) goto done; + if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; } done:

1 0

Austin English : user32: Fix a comment.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 2227abbc2cf4c89e28ab95ec3381650cb90f7951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2227abbc2cf4c89e28ab95ec3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 29 16:16:07 2014 -0700 user32: Fix a comment. --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7f91b8b..0889dac 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -519,7 +519,7 @@ static void test_inputdesktop(void) ret = CloseDesktop(input_desk); ok(ret, "CloseDesktop failed!\n"); - /* by default, GetThreadDesktop is the input desktop, SendInput should success. */ + /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); memset(name, 0, sizeof(name));

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 04ea007cbb4733cd84fcc48b6341c819472a6fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ea007cbb4733cd84fcc48b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:48 2014 +0200 mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid. --- dlls/mshtml/htmlform.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5b9982c..6cbf1f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -568,7 +568,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); nsIDOMHTMLCollection *elements; - nsAString nsname, nsstr; + nsAString nsstr, name_str; UINT32 len, i; nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; @@ -604,7 +604,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } } - nsAString_InitDepend(&nsname, nameW); nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) { nsIDOMNode *nsitem; @@ -644,21 +643,22 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } /* compare by name attr */ - nsres = nsIDOMHTMLElement_GetAttribute(nshtml_elem, &nsname, &nsstr); + nsres = get_elem_attr_value(nshtml_elem, nameW, &name_str, &str); nsIDOMHTMLElement_Release(nshtml_elem); - nsAString_GetData(&nsstr, &str); - if(!strcmpiW(str, name)) { - /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; - hres = S_OK; - break; + if(NS_SUCCEEDED(nsres)) { + if(!strcmpiW(str, name)) { + nsAString_Finish(&name_str); + /* FIXME: using index for dispid */ + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + hres = S_OK; + break; + } + nsAString_Finish(&name_str); } } - nsAString_Finish(&nsname); - nsAString_Finish(&nsstr); + nsAString_Finish(&nsstr); nsIDOMHTMLCollection_Release(elements); - return hres; }

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in check_event_attr.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: df62eea18639ca985ce740d0b7d10e9c6b0b4b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df62eea18639ca985ce740d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:37 2014 +0200 mshtml: Use get_elem_attr_value helper in check_event_attr. --- dlls/mshtml/htmlevent.c | 15 ++++----------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/mutation.c | 6 +++--- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ee384ee..484f3f7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1523,24 +1523,19 @@ void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr } } -void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) +void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { const PRUnichar *attr_value; - nsAString attr_name_str, attr_value_str; + nsAString attr_value_str; IDispatch *disp; HTMLDOMNode *node; int i; nsresult nsres; HRESULT hres; - nsAString_Init(&attr_value_str, NULL); - nsAString_Init(&attr_name_str, NULL); - for(i=0; i < EVENTID_LAST; i++) { - nsAString_SetData(&attr_name_str, event_info[i].attr_name); - nsres = nsIDOMElement_GetAttribute(nselem, &attr_name_str, &attr_value_str); + nsres = get_elem_attr_value(nselem, event_info[i].attr_name, &attr_value_str, &attr_value); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&attr_value_str, &attr_value); if(!*attr_value) continue; @@ -1555,11 +1550,9 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) } IDispatch_Release(disp); } + nsAString_Finish(&attr_value_str); } } - - nsAString_Finish(&attr_value_str); - nsAString_Finish(&attr_name_str); } HRESULT doc_init_events(HTMLDocumentNode *doc) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 528eded..d2426d3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -49,7 +49,7 @@ typedef enum { } eventid_t; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; -void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; +void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 23b37b5..b79ec1f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -638,16 +638,16 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; + nsIDOMHTMLElement *nselem; nsIDOMComment *nscomment; - nsIDOMElement *nselem; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { check_event_attr(This, nselem); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment);

1 0