January 2018 - Wine-Commits

Andrey Gusev : ntdll/tests: Fix resource leak.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: c4dd0ff5ec93c5751669634fc0625d31e1e2486b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4dd0ff5ec93c5751669634f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 4 11:22:52 2018 +0200 ntdll/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/atom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 972a54e..a481758 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -179,6 +179,7 @@ static void test_NtAtom(void) testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL); WaitForSingleObject(testThread, INFINITE); + CloseHandle(testThread); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len);

1 0

Francois Gouget : user32/tests: Make test_WS_VSCROLL() static.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: 2041e20a6908ef3a6c5e68d2c47e24532d8ae8cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2041e20a6908ef3a6c5e68d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:54:46 2018 +0100 user32/tests: Make test_WS_VSCROLL() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 72e8777..6dbdafb 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -806,7 +806,7 @@ static void test_listbox_size(DWORD style) } } -void test_WS_VSCROLL(void) +static void test_WS_VSCROLL(void) { BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hList;

1 0

Francois Gouget : twain_32: Make userselect_dlgproc() static.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: f1b0a3d74bdaca4c30f754394feb9463218e23bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1b0a3d74bdaca4c30f75439… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:56:00 2018 +0100 twain_32: Make userselect_dlgproc() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index bfd0651..0b20986 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -351,7 +351,7 @@ typedef struct { pTW_IDENTITY result; } userselect_data; -INT_PTR CALLBACK userselect_dlgproc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static INT_PTR CALLBACK userselect_dlgproc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) {

1 0

Francois Gouget : gdiplus/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: 3939fd554fe7c16ca44c889c8ca0da6566f6f4a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3939fd554fe7c16ca44c889c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:58:51 2018 +0100 gdiplus/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/brush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 9be500d..0451948 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -52,13 +52,13 @@ static void test_createHatchBrush(void) status = GdipCreateHatchBrush(HatchStyleMin, 1, 2, &brush); expect(Ok, status); - ok(brush != NULL, "Expected the brush to be initialized."); + ok(brush != NULL, "Expected the brush to be initialized.\n"); GdipDeleteBrush((GpBrush *)brush); status = GdipCreateHatchBrush(HatchStyleMax, 1, 2, &brush); expect(Ok, status); - ok(brush != NULL, "Expected the brush to be initialized."); + ok(brush != NULL, "Expected the brush to be initialized.\n"); GdipDeleteBrush((GpBrush *)brush);

1 0

Andrey Gusev : webservices/tests: Fix resource leak.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

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

Stefan Leichter : include: Add RtlCompareMemory declaration to winnt.h.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: 3b4c6e6d99805e9494646e1410be0236caa457d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4c6e6d99805e9494646e14… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Jan 4 12:15:17 2018 +0100 include: Add RtlCompareMemory declaration to winnt.h. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index a2c14cd..1fb09b3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5501,7 +5501,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE CriticalError = SERVICE_ERROR_CRITICAL } SERVICE_ERROR_TYPE; - +NTSYSAPI SIZE_T WINAPI RtlCompareMemory(const VOID*, const VOID*, SIZE_T); #define RtlEqualMemory(Destination, Source, Length) (!memcmp((Destination),(Source),(Length))) #define RtlMoveMemory(Destination, Source, Length) memmove((Destination),(Source),(Length))

1 0

Zebediah Figura : msvcrt: _Gettnames() should respect user overrides.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: 249cc1e8458a95a6227f291176811b5fa51a9989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=249cc1e8458a95a6227f2911… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 3 11:52:47 2018 -0600 msvcrt: _Gettnames() should respect user overrides. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 12 ++--- dlls/msvcrt/tests/locale.c | 122 +++++++++++++-------------------------------- 2 files changed, 40 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=249cc1e8458a95a6227f…

1 0

Hans Leidekker : Revert "msi: Store the current script in the package."
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: f25501db4b9f79b69a6c569ab418e6f5a4d8fc94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f25501db4b9f79b69a6c569a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 4 12:58:43 2018 +0100 Revert "msi: Store the current script in the package." Commit 036f007e241b95498964c53365300a3332a92c5a (which reverts 86bc556f9fd4a964cbaa66bc1fd67e4603ecd450) is not sufficient to fix the Office installers because MsiGetMode(MSIRUNMODE_SCHEDULED) no longer does the right thing after the revert. That is caused by "msi: Store the current script in the package.", which, in hindsight, should have been part of the first commit. This reverts e1e668d41fce1dbd0270cd9de0d880a236ddb869. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 25 ++++++++++--------------- dlls/msi/custom.c | 16 ++++++++++++++-- dlls/msi/dialog.c | 2 +- dlls/msi/install.c | 8 ++++---- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 8 +++++--- dlls/msi/package.c | 1 - 7 files changed, 37 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f25501db4b9f79b69a6c…

1 0

Alex Henrie : winex11: Escape non-UTF-8 characters in string literals.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

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

Francois Gouget : mlang/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: f81f7f474961b1c19163f3d6e645433a0b88bd30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81f7f474961b1c19163f3d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:58:40 2018 +0100 mlang/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 9727b4f..bcb2fd0 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2683,12 +2683,12 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); - ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p", font1, font2); - ok(font1 == font2, "expected equal, got not equal"); + ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p\n", font1, font2); + ok(font1 == font2, "expected equal, got not equal\n"); IMLangFontLink_GetFontCodePages(font_link, hdc, font1, &font_codepages); ok((codepages & (~font_codepages)) != 0 && (codepages & font_codepages) != 0, - "code pages of font is incorrect"); + "code pages of font is incorrect\n"); IMLangFontLink_ResetFontMapping(font_link); IMLangFontLink2_ResetFontMapping(font_link2);

1 0