July 2018 - Wine-commits - list.winehq.org

André Hentschel : ole32/tests: Don' t crash if EnumFormatEtc failed.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 355f6b24d2c33a48cea0fa7ef40a303f5030e4d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=355f6b24d2c33a48cea0fa7e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 1 11:40:01 2018 +0200 ole32/tests: Don't crash if EnumFormatEtc failed. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 4890782..e518996 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -589,6 +589,11 @@ static void test_enum_fmtetc(IDataObject *src) hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_EnumFormatEtc_calls == 0, "EnumFormatEtc was called\n"); + if (FAILED(hr)) + { + skip("EnumFormatEtc failed, skipping tests.\n"); + return; + } if(src) IDataObject_EnumFormatEtc(src, DATADIR_GET, &src_enum); @@ -1422,6 +1427,11 @@ static void test_nonole_clipboard(void) ok(hr == S_OK, "got %08x\n", hr); hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt); ok(hr == S_OK, "got %08x\n", hr); + if (FAILED(hr)) + { + skip("EnumFormatEtc failed, skipping tests.\n"); + return; + } hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr);

1 0

Michał Janiszewski : ntdll: Only set owned bits in RTL_BITMAP.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: a1ed500836806ef46fc3eafa7ce5f8621938cbc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ed500836806ef46fc3eafa… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Sun Jul 1 23:51:22 2018 +0200 ntdll: Only set owned bits in RTL_BITMAP. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlbitmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 318f6fc..20108f5 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -156,8 +156,8 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) /* Set from the start bit, possibly into the next byte also */ USHORT initialWord = NTDLL_maskBits[ulCount] << (ulStart & 7); - *lpOut++ |= (initialWord & 0xff); - *lpOut |= (initialWord >> 8); + *lpOut |= (initialWord & 0xff); + if (initialWord >> 8) lpOut[1] |= (initialWord >> 8); return; } } @@ -217,8 +217,8 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) /* Clear from the start bit, possibly into the next byte also */ USHORT initialWord = ~(NTDLL_maskBits[ulCount] << (ulStart & 7)); - *lpOut++ &= (initialWord & 0xff); - *lpOut &= (initialWord >> 8); + *lpOut &= (initialWord & 0xff); + if ((initialWord >> 8) != 0xff) lpOut[1] &= (initialWord >> 8); return; } }

1 0

Michael Müller : user32: Add semi-stub for GetAutoRotationState.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: efa6e6b9ef9764c6ee824e50e0815ca992d7d429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa6e6b9ef9764c6ee824e50… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 2 05:24:02 2018 +0000 user32: Add semi-stub for GetAutoRotationState. We cannot check the status value reliable since there is a good chance that all the possible values will be returned from different setups. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 11 +++++++++-- dlls/user32/tests/sysparams.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3245f20..fc55b06 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3387,8 +3387,15 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) */ BOOL WINAPI GetAutoRotationState( AR_STATE *state ) { - FIXME("(%p): stub\n", state); - *state = AR_NOT_SUPPORTED; + TRACE("(%p)\n", state); + + if (!state) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *state = AR_NOSENSOR; return TRUE; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3db058f..fec37b6 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -55,6 +55,7 @@ static INT (WINAPI *pGetSystemMetricsForDpi)(INT,UINT); static BOOL (WINAPI *pSystemParametersInfoForDpi)(UINT,UINT,void*,UINT,UINT); static BOOL (WINAPI *pLogicalToPhysicalPointForPerMonitorDPI)(HWND,POINT*); static BOOL (WINAPI *pPhysicalToLogicalPointForPerMonitorDPI)(HWND,POINT*); +static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE); static BOOL strict; static int dpi, real_dpi; @@ -3621,6 +3622,27 @@ static void test_dpi_window(void) pSetThreadDpiAwarenessContext( orig ); } +static void test_GetAutoRotationState(void) +{ + AR_STATE state; + BOOL ret; + + if (!pGetAutoRotationState) + { + win_skip("GetAutoRotationState not supported\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetAutoRotationState(NULL); + ok(!ret, "Expected GetAutoRotationState to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + state = 0; + ret = pGetAutoRotationState(&state); + ok(ret, "Expected GetAutoRotationState to succeed, error %d\n", GetLastError()); +} + START_TEST(sysparams) { int argc; @@ -3650,6 +3672,7 @@ START_TEST(sysparams) pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi"); pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI"); pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI"); + pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); @@ -3671,6 +3694,7 @@ START_TEST(sysparams) test_metrics_for_dpi( 192 ); test_EnumDisplaySettings( ); test_GetSysColorBrush( ); + test_GetAutoRotationState( ); change_counter = 0; change_last_param = 0;

1 0

Zebediah Figura : regedit: Print Latin-1 characters.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 2831fe2f84c12ab6dab2cf875661de2c829e1c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2831fe2f84c12ab6dab2cf87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 2 18:06:54 2018 +0200 regedit: Print Latin-1 characters. This makes spot-checking differences with Windows a little easier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index e082e93..21c6004 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -35,6 +35,7 @@ #include "commctrl.h" #include "wine/heap.h" +#include "wine/unicode.h" #include "main.h" /* spaces dividing hex and ASCII */ @@ -94,7 +95,7 @@ static LPWSTR HexEdit_GetLineText(int offset, BYTE *pData, LONG cbData, LONG pad for (i = 0; i < cbData; i++) { /* (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER) */ - if (isprint(pData[offset + i])) + if (isprintW(pData[offset + i])) lpszLine[6 + cbData * 3 + pad * 3 + DIV_SPACES + i] = pData[offset + i]; else lpszLine[6 + cbData * 3 + pad * 3 + DIV_SPACES + i] = '.';

1 0

Nikolay Sivov : tools: Update to Unicode 11.0.0.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: d4eeb162bb38f83a2ab0eb739fb3d7ca53ac8fa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4eeb162bb38f83a2ab0eb73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 3 12:50:56 2018 +0300 tools: Update to Unicode 11.0.0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 + dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 256 ++++++++++++++++++++++----------------------- dlls/dwrite/mirror.c | 95 +++++++++++------ dlls/dwrite/scripts.c | 176 ++++++++++++++----------------- dlls/dwrite/scripts.h | 8 +- dlls/gdi32/vertical.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 90 ++++++++-------- dlls/usp10/linebreak.c | 256 ++++++++++++++++++++++----------------------- dlls/usp10/mirror.c | 95 +++++++++++------ dlls/usp10/shaping.c | 102 +++++++++--------- dlls/wineps.drv/vertical.c | 2 +- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/wine/casemap.c | 114 +++++++++++++++----- libs/wine/wctype.c | 70 ++++++------- loader/l_intl.nls | Bin 6470 -> 6662 bytes tools/make_unicode | 12 ++- 20 files changed, 713 insertions(+), 579 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4eeb162bb38f83a2ab0…

1 0

Zebediah Figura : dinput: Notify the desktop window when device input is received.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 3edbb2a4fdd2fb46a7af13c921bcd4bf8b7ab718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3edbb2a4fdd2fb46a7af13c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 3 00:04:47 2018 +0200 dinput: Notify the desktop window when device input is received. Avoids letting the display go to sleep while a joystick is being used. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7b83a39..f99dc20 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -39,6 +39,8 @@ #include "device_private.h" #include "dinput_private.h" +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + WINE_DEFAULT_DEBUG_CHANNEL(dinput); static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -935,6 +937,8 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim /* Event is being set regardless of the queue state */ if (This->hEvent) SetEvent(This->hEvent); + PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + if (!This->queue_len || This->overflow || ofs < 0) return; next_pos = (This->queue_head + 1) % This->queue_len;

1 0

Piotr Caban : inetcpl.cpl: Add proxy server settings dialog.
by Alexandre Julliard 03 Jul '18

03 Jul '18

1 0

Francois Gouget : testbot/WineRunTask: Fix the WineTest suite command.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: tools Branch: master Commit: 2a44b307be628933989676183214a5d6bf56919e URL: https://source.winehq.org/git/tools.git/?a=commit;h=2a44b307be6289339896761… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 1 22:42:07 2018 +0200 testbot/WineRunTask: Fix the WineTest suite command. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fb29663..0f2a093 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -461,7 +461,7 @@ elsif ($Step->Type eq "suite") if (defined($WebHostName)) { my $StepTask = 100 * $StepNo + $TaskNo; - $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\""; + $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\" "; } my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details)

1 0

Francois Gouget : dissect: Raise the Windows 10 failed tests limit for 1709.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: tools Branch: master Commit: 75094084bbe9856b1f7bc3648fa4021ffa5bacc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=75094084bbe9856b1f7bc36… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 1 22:45:45 2018 +0200 dissect: Raise the Windows 10 failed tests limit for 1709. Windows 10 1709 has so many new test failures that its WineTest reports get rejected. But developers cannot fix test failures they are not aware of, resulting in slow progress. So temporarily increase the Windows 10 limit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 4db4f85..24d5621 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -368,6 +368,8 @@ foreach my $entry (@idmatch) last; } } +# Give a little slack to the Windows 10 1709. +$maxfailedtests += 20 if ($version eq "win10"); if ($prediluvian and not $acceptprediluvianwin) {

1 0

Józef Kucia : tests: Get rid of create_texture().
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: vkd3d Branch: master Commit: a0800de4ed16e5d345f6728d066abe8093163f06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0800de4ed16e5d345f6728… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 28 11:05:55 2018 +0200 tests: Get rid of create_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 80 ++++++++++++++++++++++++------------------------ tests/vkd3d_d3d12_test.h | 1 - 2 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a0800de4ed16e5d345f…

1 0