December 2017 - Wine-Commits

Alexandre Julliard : Wine release 3.0-rc4
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: website Branch: master Commit: 425fb6ea767cc71fac5f6fe37e413f28d6f1c165 URL: https://source.winehq.org/git/website.git/?a=commit;h=425fb6ea767cc71fac5f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 20:46:29 2017 +0100 Wine release 3.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017122901.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017122901.xml b/news/en/2017122901.xml new file mode 100644 index 0000000..680d285 --- /dev/null +++ b/news/en/2017122901.xml @@ -0,0 +1,12 @@ +<news> +<date>December 29, 2017</date> +<title>Wine 3.0-rc4 Released</title> +<body> + The Wine development release 3.0-rc4 is now available. + <a href="{$root}/announce/3.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Stefaniuc : d3dx9/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: wine Branch: master Commit: c5dfe1b13950a5a40bf81263ef5ea2a46d74bcfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5dfe1b13950a5a40bf81263… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 29 19:20:10 2017 +0100 d3dx9/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 43 ++++++++++++++++++++++++++++--------------- dlls/d3dx9_36/tests/mesh.c | 26 ++++++++++++++++---------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 96b21f0..1900f3e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1296,15 +1296,20 @@ static void test_effect_parameter_value_GetMatrix(const struct test_effect_param const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[16]; + union + { + DWORD d; + float f; + } cmp; + float fvalue[16]; UINT l, k, err = 0; + cmp.d = 0xabababab; memset(fvalue, 0xab, sizeof(fvalue)); hr = effect->lpVtbl->GetMatrix(effect, parameter, (D3DXMATRIX *)&fvalue); if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { - ok(hr == D3D_OK, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(hr == D3D_OK, "%u - %s: GetMatrix failed, got %#x, expected %#x.\n", i, res_full_name, hr, D3D_OK); for (k = 0; k < 4; ++k) { @@ -1322,12 +1327,14 @@ static void test_effect_parameter_value_GetMatrix(const struct test_effect_param } else { - ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrix failed, got %#x, expected %#x.\n", i, res_full_name, hr, D3DERR_INVALIDCALL); - for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (l = 0; l < ARRAY_SIZE(fvalue); ++l) + if (fvalue[l] != cmp.f) + ++err; } - ok(!err, "%u - %s: GetMatrix failed with %u errors\n", i, res_full_name, err); + ok(!err, "%u - %s: GetMatrix failed with %u errors.\n", i, res_full_name, err); } static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_parameter_value_result *res, @@ -1451,15 +1458,20 @@ static void test_effect_parameter_value_GetMatrixTranspose(const struct test_eff const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[16]; + union + { + DWORD d; + float f; + } cmp; + float fvalue[16]; UINT l, k, err = 0; + cmp.d = 0xabababab; memset(fvalue, 0xab, sizeof(fvalue)); hr = effect->lpVtbl->GetMatrixTranspose(effect, parameter, (D3DXMATRIX *)&fvalue); if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { - ok(hr == D3D_OK, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(hr == D3D_OK, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x.\n", i, res_full_name, hr, D3D_OK); for (k = 0; k < 4; ++k) { @@ -1477,7 +1489,7 @@ static void test_effect_parameter_value_GetMatrixTranspose(const struct test_eff } else if (!res_desc->Elements && (res_desc->Class == D3DXPC_VECTOR || res_desc->Class == D3DXPC_SCALAR)) { - ok(hr == D3D_OK, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(hr == D3D_OK, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x.\n", i, res_full_name, hr, D3D_OK); for (k = 0; k < 4; ++k) { @@ -1495,12 +1507,14 @@ static void test_effect_parameter_value_GetMatrixTranspose(const struct test_eff } else { - ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x.\n", i, res_full_name, hr, D3DERR_INVALIDCALL); - for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (l = 0; l < ARRAY_SIZE(fvalue); ++l) + if (fvalue[l] != cmp.f) + ++err; } - ok(!err, "%u - %s: GetMatrixTranspose failed with %u errors\n", i, res_full_name, err); + ok(!err, "%u - %s: GetMatrixTranspose failed with %u errors.\n", i, res_full_name, err); } static void test_effect_parameter_value_GetMatrixTransposeArray(const struct test_effect_parameter_value_result *res, @@ -1674,8 +1688,7 @@ static void test_effect_parameter_value_ResetValue(const struct test_effect_para static void test_effect_parameter_value(IDirect3DDevice9 *device) { - UINT i; - UINT effect_count = sizeof(test_effect_parameter_value_data) / sizeof(*test_effect_parameter_value_data); + unsigned int effect_count = ARRAY_SIZE(test_effect_parameter_value_data), i; for (i = 0; i < effect_count; ++i) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d0b1adb..82ae90e 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -818,7 +818,7 @@ static void test_fvf_decl_conversion(void) }; unsigned int i; - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { test_decl_to_fvf(test_data[i].decl, test_data[i].fvf, D3D_OK, __LINE__, i); test_fvf_to_decl(test_data[i].fvf, test_data[i].decl, D3D_OK, __LINE__, i); @@ -1185,12 +1185,15 @@ static void D3DXCreateMeshTest(void) struct mesh mesh; struct test_context *test_context; - static const D3DVERTEXELEMENT9 decl1[3] = { + static const D3DVERTEXELEMENT9 decl1[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, - D3DDECL_END(), }; + D3DDECL_END(), + }; - static const D3DVERTEXELEMENT9 decl2[] = { + static const D3DVERTEXELEMENT9 decl2[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, {0, 24, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_PSIZE, 0}, @@ -1201,7 +1204,8 @@ static void D3DXCreateMeshTest(void) D3DDECL_END(), }; - static const D3DVERTEXELEMENT9 decl3[] = { + static const D3DVERTEXELEMENT9 decl3[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {1, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, D3DDECL_END(), @@ -1268,7 +1272,7 @@ static void D3DXCreateMeshTest(void) if (hr == D3D_OK) { - size = sizeof(decl1) / sizeof(decl1[0]); + size = ARRAY_SIZE(decl1); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl1[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl1[i].Stream); @@ -1329,7 +1333,7 @@ static void D3DXCreateMeshTest(void) if (hr == D3D_OK) { - size = sizeof(decl2) / sizeof(decl2[0]); + size = ARRAY_SIZE(decl2); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl2[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl2[i].Stream); @@ -1387,10 +1391,12 @@ static void D3DXCreateMeshFVFTest(void) struct mesh mesh; struct test_context *test_context; - static const D3DVERTEXELEMENT9 decl[3] = { + static const D3DVERTEXELEMENT9 decl[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, - D3DDECL_END(), }; + D3DDECL_END(), + }; hr = D3DXCreateMeshFVF(0, 0, 0, 0, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -1453,7 +1459,7 @@ static void D3DXCreateMeshFVFTest(void) if (hr == D3D_OK) { - size = sizeof(decl) / sizeof(decl[0]); + size = ARRAY_SIZE(decl); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream);

1 0

Alexandre Julliard : Release 3.0-rc4.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: wine Branch: master Commit: 6c57e752e458706e1f4433381930d64a7767bb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c57e752e458706e1f443338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 20:43:59 2017 +0100 Release 3.0-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 184 ++++++++++++++++++++------------------------------------------ VERSION | 2 +- configure | 18 +++--- 3 files changed, 70 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c57e752e458706e1f44…

1 0

Alex Henrie : user32/tests: Recognize undefined characters in OemKeyScan tests.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: wine Branch: master Commit: 7a39a7a3ae49826b421f14fef3ff898d5e7e0b73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a39a7a3ae49826b421f14fe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 28 23:46:57 2017 -0700 user32/tests: Recognize undefined characters in OemKeyScan tests. This reverts commit 72ab2d5b078d0ebad70a0baed29a80ce6b6c86ad. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index c71cbe2..7149dc8 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 imm32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index a15a644..030592b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -54,7 +54,6 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" -#include "imm.h" #include "wine/test.h" @@ -2516,23 +2515,23 @@ static void test_OemKeyScan(void) DWORD ret, expect, vkey, scan; WCHAR oem, wchr; char oem_char; - BOOL ime = ImmIsIME(GetKeyboardLayout(0)); for (oem = 0; oem < 0x200; oem++) { ret = OemKeyScan( oem ); oem_char = LOBYTE( oem ); - if (!OemToCharBuffW( &oem_char, &wchr, 1 )) + /* OemKeyScan returns -1 for any character that cannot be mapped, + * whereas OemToCharBuff changes unmappable characters to question + * marks. The ASCII characters 0-127, including the real question mark + * character, are all mappable and are the same in all OEM codepages. */ + if (!OemToCharBuffW( &oem_char, &wchr, 1 ) || (wchr == '?' && oem_char < 0)) expect = -1; else { vkey = VkKeyScanW( wchr ); scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC ); - /* OemKeyScan returns -1 for any character that has to go through - * the IME, whereas VkKeyScan returns the virtual key code for the - * question mark key */ - if (!scan || (ime && wchr != '?' && vkey == VkKeyScanW( '?' ))) + if (!scan) expect = -1; else {

1 0

Alexandre Julliard : bcrypt: macOS version 10.8 is needed for encryption support.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: wine Branch: master Commit: 5c70c155d7f1928719f0abeb84e56134fa4e94d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c70c155d7f1928719f0abeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 11:35:37 2017 +0100 bcrypt: macOS version 10.8 is needed for encryption support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b2cb43e..c064b63 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -767,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 static ULONG get_block_size( enum alg_id alg ) { ULONG ret = 0, size = sizeof(ret); @@ -896,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } -#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 struct key { struct object hdr;

1 0

Andrey Gusev : quartz/tests: Fix resource leak.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: wine Branch: master Commit: 95dc5368175aafa91900aea1dd7c0f5c77b0f0cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=95dc5368175aafa91900aea1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 29 17:53:16 2017 +0200 quartz/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e66dc40..5fd3107 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -486,6 +486,7 @@ static void test_render_with_multithread(void) IFilterGraph2_Release(filter_graph); IGraphBuilder_Release(graph_builder); IClassFactory_Release(classfactory); + CloseHandle(thread); CoUninitialize(); return; }

1 0

Tag wine-3.0-rc4 : Alexandre Julliard : Release 3.0-rc4
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: wine Branch: refs/tags/wine-3.0-rc4 Tag: 46ee5f7386fd60c75ad2efc6b21804e193856e2c URL: https://source.winehq.org/git/wine.git/?a=tag;h=46ee5f7386fd60c75ad2efc6b21… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 20:43:59 2017 +0100 Release 3.0-rc4

1 0

Francois Gouget : testbot: Record and show status changes initiated by the administrator.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: tools Branch: master Commit: 0aca56e2e53a3f4e0011fbeff38e51d028b1df31 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0aca56e2e53a3f4e0011fbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 29 00:23:56 2017 +0100 testbot: Record and show status changes initiated by the administrator. This allows marking them as initiated by the administrator (which is obvious when going in/out of maintenance but not otherwise). Merge these records with the one the scheduler adds on its own to keep the activity page clean. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 10 +++++++++- testbot/lib/WineTestBot/Activity.pm | 12 +++++++++++- testbot/web/admin/VMDetails.pl | 21 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index fb743a0..7489f83 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -358,7 +358,7 @@ sub SaveProperty($$$) die "Pure virtual function FormPage::SaveProperty called"; } -sub Save($) +sub SaveProperties($) { my ($self) = @_; @@ -389,6 +389,14 @@ sub Save($) } } } + return 1; +} + +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SaveProperties()); my $ErrKey; ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 1e414c8..5a5d232 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -233,7 +233,17 @@ sub GetActivity($) my $VMStatus = $StatusVMs->{$VM->Name}; if ($VMStatus) { - $LastVMStatus->{end} = $VMStatus->{start} if ($LastVMStatus); + if ($LastVMStatus and $LastVMStatus->{status} eq $VMStatus->{status} and + ($LastVMStatus->{details} || "") eq "administrator") + { + $VMStatus = $StatusVMs->{$VM->Name} = $LastVMStatus; + $LastStatusVMs{$VM->Name}->{$VM->Name} = {merged => 1, vmstatus => $VMStatus}; + $VMStatus->{rows}++; + } + else + { + $LastVMStatus->{end} = $VMStatus->{start} if ($LastVMStatus); + } } elsif ($LastVMStatus and $LastVMStatus->{status} ne "engine") { diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f5e5520..7b562a7 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -42,6 +42,27 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub Save($) +{ + my ($self) = @_; + + my $OldStatus = $self->{Item}->Status || ""; + return !1 if (!$self->SaveProperties()); + + if ($OldStatus ne $self->{Item}->Status) + { + my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); + if (!defined $ErrMessage) + { + $self->{Item}->RecordStatus(undef, $self->{Item}->Status ." administrator"); + } + } + + my $ErrKey; + ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return ! defined($self->{ErrMessage}); +} + package main; my $Request = shift;

1 0

Francois Gouget : testbot/web: Add a statistics page.
by Alexandre Julliard Dec. 29, 2017

Dec. 29, 2017

Module: tools Branch: master Commit: c6faad519212569ba543b6eaeaa7dc493f6f4a88 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6faad519212569ba543b6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 29 00:23:48 2017 +0100 testbot/web: Add a statistics page. This can help figuring out how busy the TestBot is, whether the VMs must be rebalanced to lighten the load on a VM host, whether reverts are getting slow, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 165 ++++++++++++++- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/web/Stats.pl | 361 ++++++++++++++++++++++++++++++++ testbot/web/WineTestBot.css | 2 + 4 files changed, 528 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=c6faad519212569ba54…

1 0

Alex Henrie : user32/tests: Fix OemKeyScan failures with input method editors.
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: 72ab2d5b078d0ebad70a0baed29a80ce6b6c86ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ab2d5b078d0ebad70a0bae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 28 10:45:46 2017 -0700 user32/tests: Fix OemKeyScan failures with input method editors. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc8..c71cbe2 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 imm32 C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 793590e..a15a644 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -54,6 +54,7 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "imm.h" #include "wine/test.h" @@ -2515,6 +2516,7 @@ static void test_OemKeyScan(void) DWORD ret, expect, vkey, scan; WCHAR oem, wchr; char oem_char; + BOOL ime = ImmIsIME(GetKeyboardLayout(0)); for (oem = 0; oem < 0x200; oem++) { @@ -2527,7 +2529,10 @@ static void test_OemKeyScan(void) { vkey = VkKeyScanW( wchr ); scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC ); - if (!scan) + /* OemKeyScan returns -1 for any character that has to go through + * the IME, whereas VkKeyScan returns the virtual key code for the + * question mark key */ + if (!scan || (ime && wchr != '?' && vkey == VkKeyScanW( '?' ))) expect = -1; else {

1 0