October 2012 - Wine-commits

Huw Davies : user32: If the value doesn' t exist under the volatile key fallback to the permanent key.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 5c8e83c40653b01e96b7cacd0de4dac3836207b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8e83c40653b01e96b7cacd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 12:56:02 2012 +0100 user32: If the value doesn't exist under the volatile key fallback to the permanent key. --- dlls/user32/sysparams.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b27b506..0fad03b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -622,12 +622,19 @@ static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, LPBYTE lpBuf HKEY hKey; memset( lpBuf, 0, count ); - if ((RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS) || - (RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS)) + + if (RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS) + { + ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count ); + RegCloseKey( hKey ); + } + + if (!ret && RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS) { - ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count); + ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count ); RegCloseKey( hKey ); } + return ret; }

1 0

Marcus Meissner : mshtml: Removed duplicate condition (Coverity).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 0f4c2f9a8c68fd955f355a9ec860ff03e1ed88cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4c2f9a8c68fd955f355a9ec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 15:49:00 2012 +0200 mshtml: Removed duplicate condition (Coverity). --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7ce53b2..58fcd9a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -755,7 +755,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: - if(This->dynamic_data && This->dynamic_data && This->dynamic_data->func_disps + if(This->dynamic_data && This->dynamic_data->func_disps && This->dynamic_data->func_disps[func->func_disp_idx].func_obj) { func_obj_entry_t *entry = This->dynamic_data->func_disps + func->func_disp_idx;

1 0

Marcus Meissner : shell32: Check return value of SHGetSpecialFolderPathW ( Coverity).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 4413e00ecab4271a270bfc91d5d9a0cc306d5ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4413e00ecab4271a270bfc91d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 15:51:15 2012 +0200 shell32: Check return value of SHGetSpecialFolderPathW (Coverity). --- dlls/shell32/shfldr_desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 6d52fd0..c22335a 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -332,7 +332,7 @@ static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) } /* enumerate the elements in %windir%\desktop */ - SHGetSpecialFolderPathW(0, szPath, CSIDL_DESKTOPDIRECTORY, FALSE); + ret = ret && SHGetSpecialFolderPathW(0, szPath, CSIDL_DESKTOPDIRECTORY, FALSE); ret = ret && CreateFolderEnumList(list, szPath, dwFlags); return ret;

1 0

Marcus Meissner : dsound: Skip unknown sizes in tests (Coverity).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: b78744ce315cdcbf5684f342713ed1a6c814cd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78744ce315cdcbf5684f3427… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:01:25 2012 +0200 dsound: Skip unknown sizes in tests (Coverity). --- dlls/dsound/tests/ds3d.c | 4 +++- dlls/dsound/tests/ds3d8.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 36e59c9..0caa33d 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -381,7 +381,9 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; ieee = IsEqualGUID(&wfxe.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - } + } else + return; + ok(rc==DS_OK, "IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); if (rc==DS_OK && winetest_debug > 1) { diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index c432d35..295a406 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -223,7 +223,9 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; ieee = IsEqualGUID(&wfxe.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - } + } else + return; + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); if (rc==DS_OK && winetest_debug > 1) { trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",

1 0

Marcus Meissner : advapi32: Free wstr in error case to avoid leak (Coverity ).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 91a767d75b12d67cabfebeb22b7cf176c8b6e4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a767d75b12d67cabfebeb22… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:21:35 2012 +0200 advapi32: Free wstr in error case to avoid leak (Coverity). --- dlls/advapi32/security.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8b60dd6..c86ca17 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4861,17 +4861,25 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCR wstr = wptr = LocalAlloc(0, (len + 1)*sizeof(WCHAR)); if (RequestedInformation & OWNER_SECURITY_INFORMATION) - if (!DumpOwner(SecurityDescriptor, &wptr, NULL)) + if (!DumpOwner(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } if (RequestedInformation & GROUP_SECURITY_INFORMATION) - if (!DumpGroup(SecurityDescriptor, &wptr, NULL)) + if (!DumpGroup(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } if (RequestedInformation & DACL_SECURITY_INFORMATION) - if (!DumpDacl(SecurityDescriptor, &wptr, NULL)) + if (!DumpDacl(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } if (RequestedInformation & SACL_SECURITY_INFORMATION) - if (!DumpSacl(SecurityDescriptor, &wptr, NULL)) + if (!DumpSacl(SecurityDescriptor, &wptr, NULL)) { + LocalFree (wstr); return FALSE; + } *wptr = 0; TRACE("ret: %s, %d\n", wine_dbgstr_w(wstr), len);

1 0

Marcus Meissner : advapi32: Avoid memory leak on pipe read failure ( Coverity).
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: aaabec2b3376c3012eceb7f9ae247e2b67949e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabec2b3376c3012eceb7f9a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:52:05 2012 +0200 advapi32: Avoid memory leak on pipe read failure (Coverity). --- dlls/advapi32/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f69e78f..49d56d1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -402,11 +402,13 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { if (GetLastError() != ERROR_BROKEN_PIPE) ERR( "pipe read failed error %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, data ); break; } if (count != data_size) { ERR( "partial pipe read %u/%u\n", count, data_size ); + HeapFree( GetProcessHeap(), 0, data ); break; } }

1 0

Jacek Caban : mshtml: Added support for binding ActiveX events with script event attribute.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: eda756dbb54d44b09441b1d53549a062c54d8822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda756dbb54d44b09441b1d53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:26:28 2012 +0200 mshtml: Added support for binding ActiveX events with script event attribute. --- dlls/mshtml/pluginhost.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 3 + dlls/mshtml/script.c | 7 +- 3 files changed, 378 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eda756dbb54d44b09441b…

1 0

Jacek Caban : mshtml: Added ActiveX event binding test.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 5c15ca13d2c960b02ea8b8f8bce6bee9a55c1e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c15ca13d2c960b02ea8b8f8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:26:46 2012 +0200 mshtml: Added ActiveX event binding test. --- .gitignore | 2 + dlls/mshtml/tests/Makefile.in | 3 + dlls/mshtml/tests/activex.c | 341 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/rsrc.rc | 3 + dlls/mshtml/tests/test_tlb.idl | 55 +++++++ 5 files changed, 401 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c15ca13d2c960b02ea8b…

1 0

Jacek Caban : jscript: Removed useless return statement in jsval_number.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 730479e6a4b00d9143bd4a6f7accccb726559257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730479e6a4b00d9143bd4a6f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:54:14 2012 +0200 jscript: Removed useless return statement in jsval_number. --- dlls/jscript/jsval.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index d355b5e..c75204f 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -154,7 +154,6 @@ static inline jsval_t jsval_number(double n) ret.u.s.tag = 0x7ff00000; } } - return ret; #else ret.type = JSV_NUMBER; ret.u.n = n;

1 0

Alexandre Julliard : winex11: Don' t try to change the window visual if we don't have a valid ARGB visual.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 37f36b732652db23abd4a16a2850ad6852653711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f36b732652db23abd4a16a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 09:59:00 2012 +0200 winex11: Don't try to change the window visual if we don't have a valid ARGB visual. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ad18eff..052eafa 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2371,7 +2371,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(data = get_win_data( hwnd ))) return FALSE; - if (!data->embedded) set_window_visual( data, &argb_visual ); + if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual ); rect = *window_rect; OffsetRect( &rect, -window_rect->left, -window_rect->top );

1 0