wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Andrey Gusev : shell32/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 498009c6bd530dc5544b21e7cd6941fd7211a7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=498009c6bd530dc5544b21e7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 15:23:26 2018 +0200 shell32/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 28dad2c..0bb4960 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -452,6 +452,7 @@ static void test_request_groups(DWORD instance, HCONV hconv) "directory '%s' missing from group list\n", finddata.cFileName); } } while (FindNextFileA(hfind, &finddata)); + FindClose(hfind); } START_TEST(progman_dde)

1 0

Andrey Gusev : user32/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: f547891e7652cca4c540b7771aa67f95c9a200ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f547891e7652cca4c540b777… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 14:37:28 2018 +0200 user32/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f9472ec..f492ecc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9400,6 +9400,7 @@ static void test_smresult(void) CloseHandle(data.thread_got_wm_app); CloseHandle(data.main_in_wm_app_1); CloseHandle(data.thread_replied); + CloseHandle(hThread); } static void test_GetMessagePos(void)

1 0

Francois Gouget : mshtml: Make IEventTarget_{add, remove}EventListener_hook () static.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: a7c696aee94b03a1597a9e4fea8bf5114b9b0f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c696aee94b03a1597a9e4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:57:55 2018 +0100 mshtml: Make IEventTarget_{add,remove}EventListener_hook() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cbb9954..abc0a1c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2261,7 +2261,7 @@ static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent * return dispatch_event_object(This, event, DISPATCH_STANDARD, result); } -HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { /* If only two arguments were given, implicitly set capture to false */ @@ -2282,7 +2282,7 @@ HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD f return S_FALSE; /* fallback to default */ } -HRESULT IEventTarget_removeEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT IEventTarget_removeEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { /* If only two arguments were given, implicitly set capture to false */

1 0

Francois Gouget : mshtml/tests: Fix typos in a few comments.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 325f438a41cf0c0621c7a72129dd80865991aa1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=325f438a41cf0c0621c7a721… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:57:22 2018 +0100 mshtml/tests: Fix typos in a few comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 2 +- dlls/mshtml/tests/events.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index f20fd3b..39860ff 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -266,7 +266,7 @@ function test_attach_in_attach() { calls += "div.onclick,"; div.attachEvent("onclick", function() { calls += "div.click,"; - /* listener attached inside an other attached listener will not ve invoked */ + /* listener attached inside another attached listener will not be invoked */ div.attachEvent("onclick", function () { ok(false, "unexpected call"); }); }); } diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index f7df4d8..f471b86 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -405,7 +405,7 @@ function test_init_event() { ok(e.target === elem, "target != elem"); ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); - /* initEvent no longer has effect except reseting defaultPrevented */ + /* initEvent no longer has any effect except resetting defaultPrevented */ e.initEvent("test", true, false); ok(e.type === "NewTest", "type = " + e.type); ok(e.bubbles === false, "bubbles = " + e.bubbles);

1 0

Francois Gouget : ole32: Rename entry_updatable() to its more common spelling.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 5fd5618e3d334551defa35cba365b14edb55038f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd5618e3d334551defa35cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:55:48 2018 +0100 ole32: Rename entry_updatable() to its more common spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ad55c6e..4ba0826 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2562,7 +2562,7 @@ static HRESULT WINAPI DataCache_IOleCache2_SetData( return OLE_E_BLANK; } -static BOOL entry_updateable( DataCacheEntry *entry, DWORD mode ) +static BOOL entry_updatable( DataCacheEntry *entry, DWORD mode ) { BOOL is_blank = entry->stgmedium.tymed == TYMED_NULL; @@ -2595,7 +2595,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat { slots++; - if (!entry_updateable( cache_entry, mode )) + if (!entry_updatable( cache_entry, mode )) { done_one = TRUE; continue;

1 0

Alexandre Julliard : ntdll: Fix source/destination confusion in vsscanf.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 62a1410a07476ac94acceaf2a9e65628d4b06ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a1410a07476ac94acceaf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 16:09:30 2018 +0100 ntdll: Fix source/destination confusion in vsscanf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index eb762c6..c349add 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1178,19 +1178,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) else goto widecharacter; character: { /* read single character into char */ - char *str = suppress ? NULL : va_arg( ap, char * ); - char *pstr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if(size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1202,19 +1202,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; widecharacter: { /* read single character into a WCHAR */ - WCHAR *str = suppress ? NULL : va_arg( ap, WCHAR * ); - WCHAR *pstr = str; + WCHAR *sptr = suppress ? NULL : va_arg( ap, WCHAR * ); + WCHAR *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if (size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1248,10 +1248,10 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; case '[': { - char *str = suppress ? NULL : va_arg( ap, char * ); - char *sptr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; RTL_BITMAP bitMask; - ULONG Mask[8]; + ULONG Mask[8] = { 0 }; BOOLEAN invert = FALSE; /* Set if we are NOT to find the chars */ unsigned size = UINT_MAX; @@ -1312,7 +1312,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) if(size > 1) size--; else { - *str = 0; + if (!suppress) *sptr_beg = 0; return rd; } }

1 0

Louis Lenders : wtsapi32: Fix copy/paste error in comment.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 0bdd879fde17ded68f03502ae2ff44e14176fabb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bdd879fde17ded68f03502a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 4 10:10:00 2018 +0100 wtsapi32: Fix copy/paste error in comment. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c668604..aeb4b65 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -277,7 +277,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) } /************************************************************ - * WTSRegisterSessionNotification (WTSAPI32.@) + * WTSRegisterSessionNotificationEx (WTSAPI32.@) */ BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) {

1 0

Alex Henrie : gameux/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 85d970b7c86617164ec6ec55802cf5f13734477e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d970b7c86617164ec6ec55… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 4 22:01:48 2018 -0700 gameux/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1ef7a78..05c2a11 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -454,7 +454,7 @@ static void _findGameInstanceId(int line, ++dwMaxSubKeyLen; /* for string terminator */ lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name\n"); } if(SUCCEEDED(hr))

1 0

Andrey Gusev : webservices/tests: Fix resource leak.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 5485189eb0d23167de3251fd4b84de70458a9815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5485189eb0d23167de3251fd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 4 19:10:45 2018 +0200 webservices/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 4 ++++ dlls/webservices/tests/proxy.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 32820fe..17a0b58 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -976,6 +976,7 @@ START_TEST(channel) thread = start_listener( &info ); test_message_read_write( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; info.binding = WS_TCP_CHANNEL_BINDING; @@ -984,6 +985,7 @@ START_TEST(channel) thread = start_listener( &info ); test_duplex_session( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX; info.binding = WS_UDP_CHANNEL_BINDING; @@ -992,6 +994,7 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; info.binding = WS_TCP_CHANNEL_BINDING; @@ -999,6 +1002,7 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); if (firewall_enabled) set_firewall( APP_REMOVE ); } diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index bc7ef81..95f980a 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -732,7 +732,11 @@ START_TEST(proxy) ret = WaitForSingleObject( info.event, 3000 ); ok(ret == WAIT_OBJECT_0, "failed to start test server %u\n", GetLastError()); - if (ret != WAIT_OBJECT_0) return; + if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); + return; + } test_WsSendMessage( info.port, &test1 ); test_WsReceiveMessage( info.port ); @@ -741,4 +745,5 @@ START_TEST(proxy) test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); }

1 0

Alex Henrie : winex11: Escape non-UTF-8 characters in string literals.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 5c06eba58e841af1db63f1a2f79193c9bb303ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c06eba58e841af1db63f1a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 4 07:30:50 2018 -0700 winex11: Escape non-UTF-8 characters in string literals. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 334 ++++++++++++++++++++++---------------------- 1 file changed, 167 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c06eba58e841af1db63…

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018