October 2019 - Wine-Commits

Piotr Caban : msvcrt: Cleanup sprintf tests.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: d5cde6ea26fbde412aded8914507fb7a868b160f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5cde6ea26fbde412aded891… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 16:00:17 2019 +0100 msvcrt: Cleanup sprintf tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 806 +++++++++++---------------------------------- 1 file changed, 193 insertions(+), 613 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5cde6ea26fbde412ade…

1 0

Zebediah Figura : quartz/tests: Relax some more timeouts.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: cda738d61d43065f80797eb8ac78bfe09f8891c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda738d61d43065f80797eb8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 22:57:08 2019 -0500 quartz/tests: Relax some more timeouts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/tests/systemclock.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 14f2dfaa7a..4b233dbcff 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -512,7 +512,7 @@ static void test_media_event(IFilterGraph2 *graph) while (!got_eos) { - if (WaitForSingleObject(event, 2000) == WAIT_TIMEOUT) + if (WaitForSingleObject(event, 5000) == WAIT_TIMEOUT) break; while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 3c493a0f38..fa1ab6856b 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -120,8 +120,8 @@ static void test_advise(void) hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 460) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 80), "Event should be signaled.\n"); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -133,15 +133,15 @@ static void test_advise(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 520) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 540) == WAIT_TIMEOUT, "Event should not be signaled.\n"); ResetEvent(event); hr = IReferenceClock_GetTime(clock, &current); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); hr = IReferenceClock_AdviseTime(clock, current + 500 * 10000, 0, (HEVENT)event, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 460) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 80), "Event should be signaled.\n"); hr = IReferenceClock_GetTime(clock, &current); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr);

1 0

Jacek Caban : vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: ce6c9f6d338a40c4f39b6758dae6d600823da767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6c9f6d338a40c4f39b6758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:07 2019 +0100 vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6e0dfc6938..4171df3915 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -72,7 +72,8 @@ static HRESULT WINAPI Builtin_QueryInterface(IDispatch *iface, REFIID riid, void TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IDispatch_iface; }else { - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + if(!IsEqualGUID(riid, &IID_IDispatchEx)) + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOINTERFACE; }

1 0

Alex Henrie : ntdll: Implement NtPowerInformation(SystemBatteryState) on Linux.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 63ddf0343b352d5709a587b9a1efc52bf111ab6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ddf0343b352d5709a587b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 29 20:22:23 2019 -0600 ntdll: Implement NtPowerInformation(SystemBatteryState) on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5afdf77986..81bac70b0f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3137,6 +3137,73 @@ static ULONG mhz_from_cpuinfo(void) } #endif +#ifdef linux + +static const char * get_sys_str(const char *path) +{ + static char s[16]; + FILE *f = fopen(path, "r"); + const char *ret = NULL; + if (f) + { + if (fgets(s, sizeof(s), f)) + ret = s; + fclose(f); + } + return ret; +} + +static int get_sys_int(const char *path, int def) +{ + const char *s = get_sys_str(path); + return s ? atoi(s) : def; +} + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) +{ + char path[64]; + const char *s; + unsigned int i = 0; + LONG64 voltage; /* microvolts */ + + bs->AcOnLine = get_sys_int("/sys/class/power_supply/AC/online", 1); + + for (;;) + { + sprintf(path, "/sys/class/power_supply/BAT%u/status", i); + s = get_sys_str(path); + if (!s) break; + bs->Charging |= (strcmp(s, "Charging\n") == 0); + bs->Discharging |= (strcmp(s, "Discharging\n") == 0); + bs->BatteryPresent = TRUE; + i++; + } + + if (bs->BatteryPresent) + { + voltage = get_sys_int("/sys/class/power_supply/BAT0/voltage_now", 0); + bs->MaxCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_full", 0) * voltage / 1e9; + bs->RemainingCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_now", 0) * voltage / 1e9; + bs->Rate = -get_sys_int("/sys/class/power_supply/BAT0/current_now", 0) * voltage / 1e9; + if (!bs->Charging && (LONG)bs->Rate < 0) + bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; + else + bs->EstimatedTime = ~0u; + } + + return STATUS_SUCCESS; +} + +#else + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *) +{ + FIXME("SystemBatteryState not implemented on this platform\n"); + return STATUS_NOT_IMPLEMENTED; +} + +#endif + /****************************************************************************** * NtPowerInformation [NTDLL.@] * @@ -3190,6 +3257,12 @@ NTSTATUS WINAPI NtPowerInformation( PowerCaps->DefaultLowLatencyWake = PowerSystemUnspecified; return STATUS_SUCCESS; } + case SystemBatteryState: { + if (nOutputBufferSize < sizeof(SYSTEM_BATTERY_STATE)) + return STATUS_BUFFER_TOO_SMALL; + memset(lpOutputBuffer, 0, sizeof(SYSTEM_BATTERY_STATE)); + return fill_battery_state(lpOutputBuffer); + } case SystemExecutionState: { PULONG ExecutionState = lpOutputBuffer; WARN("semi-stub: SystemExecutionState\n"); /* Needed for .NET Framework, but using a FIXME is really noisy. */

1 0

Alex Henrie : kernel32: Implement GetSystemPowerStatus on top of NtPowerInformation.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: c58e3a5e29c6d6e8792adfd1af71bff9dbfe09df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58e3a5e29c6d6e8792adfd1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 29 20:22:25 2019 -0600 kernel32: Implement GetSystemPowerStatus on top of NtPowerInformation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 48 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 7efd84d410..d967dfefa7 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -45,19 +45,47 @@ BOOL WINAPI GetDevicePowerState(HANDLE hDevice, BOOL* pfOn) */ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) { - WARN("(%p): stub, harmless.\n", ps); + SYSTEM_BATTERY_STATE bs; + NTSTATUS status; + + TRACE("(%p)\n", ps); + + ps->ACLineStatus = AC_LINE_UNKNOWN; + ps->BatteryFlag = BATTERY_FLAG_UNKNOWN; + ps->BatteryLifePercent = BATTERY_PERCENTAGE_UNKNOWN; + ps->SystemStatusFlag = 0; + ps->BatteryLifeTime = BATTERY_LIFE_UNKNOWN; + ps->BatteryFullLifeTime = BATTERY_LIFE_UNKNOWN; + + status = NtPowerInformation(SystemBatteryState, NULL, 0, &bs, sizeof(bs)); + if (status == STATUS_NOT_IMPLEMENTED) return TRUE; + if (FAILED(status)) return FALSE; + + ps->ACLineStatus = bs.AcOnLine; - if (ps) + if (bs.BatteryPresent) { - ps->ACLineStatus = 255; - ps->BatteryFlag = 255; - ps->BatteryLifePercent = 255; - ps->SystemStatusFlag = 0; - ps->BatteryLifeTime = ~0u; - ps->BatteryFullLifeTime = ~0u; - return TRUE; + ps->BatteryLifePercent = bs.MaxCapacity ? bs.RemainingCapacity / bs.MaxCapacity : 100; + ps->BatteryLifeTime = bs.EstimatedTime; + if (!bs.Charging && (LONG)bs.Rate < 0) + ps->BatteryFullLifeTime = 3600 * bs.MaxCapacity / -(LONG)bs.Rate; + + ps->BatteryFlag = 0; + if (bs.Charging) + ps->BatteryFlag |= BATTERY_FLAG_CHARGING; + if (ps->BatteryLifePercent > 66) + ps->BatteryFlag |= BATTERY_FLAG_HIGH; + if (ps->BatteryLifePercent < 33) + ps->BatteryFlag |= BATTERY_FLAG_LOW; + if (ps->BatteryLifePercent < 5) + ps->BatteryFlag |= BATTERY_FLAG_CRITICAL; } - return FALSE; + else + { + ps->BatteryFlag = BATTERY_FLAG_NO_BATTERY; + } + + return TRUE; } /***********************************************************************

1 0

Alex Henrie : kernel32/tests: Add tests for GetSystemPowerStatus.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: b0635c9b208d4ef2a47a4d1be853aa53a80dc85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0635c9b208d4ef2a47a4d1b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 29 20:22:24 2019 -0600 kernel32/tests: Add tests for GetSystemPowerStatus. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/power.c | 83 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e06141d9f6..e9516603ce 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -25,6 +25,7 @@ SOURCES = \ module.c \ path.c \ pipe.c \ + power.c \ process.c \ profile.c \ resource.c \ diff --git a/dlls/kernel32/tests/power.c b/dlls/kernel32/tests/power.c new file mode 100644 index 0000000000..af488849e2 --- /dev/null +++ b/dlls/kernel32/tests/power.c @@ -0,0 +1,83 @@ +/* + * Unit tests for power management functions + * + * Copyright (c) 2019 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +void test_GetSystemPowerStatus(void) +{ + SYSTEM_POWER_STATUS ps; + BOOL ret; + BYTE capacity_flags, expected_capacity_flags; + + if (0) /* crashes */ + GetSystemPowerStatus(NULL); + + memset(&ps, 0x23, sizeof(ps)); + ret = GetSystemPowerStatus(&ps); + ok(ret == TRUE, "expected TRUE\n"); + + if (ps.BatteryFlag == BATTERY_FLAG_UNKNOWN) + { + skip("GetSystemPowerStatus not implemented or not working\n"); + return; + } + else if (ps.BatteryFlag != BATTERY_FLAG_NO_BATTERY) + { + trace("battery detected\n"); + expected_capacity_flags = 0; + if (ps.BatteryLifePercent > 66) + expected_capacity_flags |= BATTERY_FLAG_HIGH; + if (ps.BatteryLifePercent < 33) + expected_capacity_flags |= BATTERY_FLAG_LOW; + if (ps.BatteryLifePercent < 5) + expected_capacity_flags |= BATTERY_FLAG_CRITICAL; + capacity_flags = (ps.BatteryFlag & ~BATTERY_FLAG_CHARGING); + ok(capacity_flags == expected_capacity_flags, + "expected %u%%-charged battery to have capacity flags 0x%02x, got 0x%02x\n", + ps.BatteryLifePercent, expected_capacity_flags, capacity_flags); + ok(ps.BatteryLifeTime <= ps.BatteryFullLifeTime, + "expected BatteryLifeTime %u to be less than or equal to BatteryFullLifeTime %u\n", + ps.BatteryLifeTime, ps.BatteryFullLifeTime); + if (ps.BatteryFlag & BATTERY_FLAG_CHARGING) + { + ok(ps.BatteryLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryLifeTime to be -1 when charging, got %u\n", ps.BatteryLifeTime); + ok(ps.BatteryFullLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryFullLifeTime to be -1 when charging, got %u\n", ps.BatteryFullLifeTime); + } + } + else + { + trace("no battery detected\n"); + ok(ps.ACLineStatus == AC_LINE_ONLINE, + "expected ACLineStatus to be 1, got %u\n", ps.ACLineStatus); + ok(ps.BatteryLifePercent == BATTERY_PERCENTAGE_UNKNOWN, + "expected BatteryLifePercent to be -1, got %u\n", ps.BatteryLifePercent); + ok(ps.BatteryLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryLifeTime to be -1, got %u\n", ps.BatteryLifeTime); + ok(ps.BatteryFullLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryFullLifeTime to be -1, got %u\n", ps.BatteryFullLifeTime); + } +} + +START_TEST(power) +{ + test_GetSystemPowerStatus(); +}

1 0

Andrew Eikum : ntdll: Add missing spec file entry for EtwEventWriteString.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 9e817f8f8b8a710c92b66f5c791f667937a9121f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e817f8f8b8a710c92b66f5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 31 08:58:13 2019 -0500 ntdll: Add missing spec file entry for EtwEventWriteString. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 1 + include/evntprov.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index f12a6a157b..6722ea7d62 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -37,6 +37,7 @@ static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *); static ULONG (WINAPI *pEventUnregister)(REGHANDLE); +static ULONG (WINAPI *pEventWriteString)(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); @@ -49,6 +50,7 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pEventWriteString = (void*)GetProcAddress(hadvapi32, "EventWriteString"); pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); @@ -1153,6 +1155,7 @@ static void cleanup_eventlog(void) static void test_trace_event_params(void) { + static const WCHAR emptyW[] = {0}; static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; REGHANDLE reg_handle; @@ -1173,6 +1176,12 @@ static void test_trace_event_params(void) uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); + uret = pEventWriteString(0, 0, 0, emptyW); + todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventWriteString gave wrong error: %#x\n", uret); + + uret = pEventWriteString(reg_handle, 0, 0, NULL); + todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventWriteString gave wrong error: %#x\n", uret); + uret = pEventUnregister(0); todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 06811edf01..a42b4fc248 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,6 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) +@ stdcall EtwEventWriteString(int64 long int64 ptr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) diff --git a/include/evntprov.h b/include/evntprov.h index a49fa79d9a..a89c65fd4b 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -73,6 +73,7 @@ ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG WINAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus

1 0

Zhiyi Zhang : winex11.drv: Call XFlush() right after XUngrabServer().
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 6dbb153ede48e77a87dddf37e5276276a701c5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbb153ede48e77a87dddf37… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 25 21:39:54 2019 +0800 winex11.drv: Call XFlush() right after XUngrabServer(). XGrabServer() stops the processing of other display connections until a XUngrabServer() call is actually processed by the X server. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/palette.c | 1 + dlls/winex11.drv/xrandr.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index bba2253264..073761a5ee 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -480,6 +480,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template palette_size = c_min + NB_RESERVED_COLORS; XUngrabServer(gdi_display); + XFlush(gdi_display); TRACE("adjusted size %i colorcells\n", palette_size); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6bb2b18ce7..85da5efea3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -419,6 +419,7 @@ static LONG xrandr12_set_current_mode( int mode ) if (status != RRSetConfigSuccess) { XUngrabServer( gdi_display ); + XFlush( gdi_display ); ERR("Failed to disable CRTC.\n"); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); @@ -440,6 +441,7 @@ static LONG xrandr12_set_current_mode( int mode ) crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); XUngrabServer( gdi_display ); + XFlush( gdi_display ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources );

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetMaterial().
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 81d520cd676206069c2295e73e0c6966a54de36a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81d520cd676206069c2295e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 21:34:39 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7b9be1fc46..7224c31e6e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2158,7 +2158,9 @@ static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); + if (!device->recording) + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : msvcrt: Reimplement strcmp/strncmp to get consistent return values.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 97425bd9639578c397f260d5c745a73f0964406a URL: https://source.winehq.org/git/wine.git/?a=commit;h=97425bd9639578c397f260d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 31 09:35:40 2019 +0100 msvcrt: Reimplement strcmp/strncmp to get consistent return values. The system functions may not always return -1 or 1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/string.c | 15 +++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index a1826a9b1a..404aa1146e 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -2075,7 +2075,7 @@ int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r) int ret; if (l == r) ret = 0; - else ret = strcmp(l->mangled + 1, r->mangled + 1); + else ret = MSVCRT_strcmp(l->mangled + 1, r->mangled + 1); TRACE("(%p %p) returning %d\n", l, r, ret); return ret; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 526ae9b9b5..770ee672af 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -118,7 +118,7 @@ static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char* static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 ) { - return strcmp( (const char*)s1, (const char*)s2 ); + return MSVCRT_strcmp( (const char*)s1, (const char*)s2 ); } static inline int u_strcasecmp( const unsigned char *s1, const unsigned char *s2 ) @@ -128,7 +128,7 @@ static inline int u_strcasecmp( const unsigned char *s1, const unsigned char *s2 static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) { - return strncmp( (const char*)s1, (const char*)s2, len ); + return MSVCRT_strncmp( (const char*)s1, (const char*)s2, len ); } static inline int u_strncasecmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index bfc084425f..d984ab0efd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1176,6 +1176,8 @@ int __cdecl MSVCRT__stricmp(const char*, const char*); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +int __cdecl MSVCRT_strncmp(const char*, const char*, MSVCRT_size_t); +int __cdecl MSVCRT_strcmp(const char*, const char*); char* __cdecl MSVCRT_strstr(const char*, const char*); unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4ae523cece..346cba7e72 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -616,7 +616,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcmp(str1, str2); + return MSVCRT_strcmp(str1, str2); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -667,7 +667,7 @@ int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncmp(str1, str2, count); + return MSVCRT_strncmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, MSVCRT_strnlen(str1, count), str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; @@ -1943,7 +1943,10 @@ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) */ int __cdecl MSVCRT_strcmp(const char *str1, const char *str2) { - return strcmp(str1, str2); + while (*str1 && *str1 == *str2) { str1++; str2++; } + if (*str1 > *str2) return 1; + if (*str1 < *str2) return -1; + return 0; } /********************************************************************* @@ -1951,7 +1954,11 @@ int __cdecl MSVCRT_strcmp(const char *str1, const char *str2) */ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len) { - return strncmp(str1, str2, len); + if (!len) return 0; + while (--len && *str1 && *str1 == *str2) { str1++; str2++; } + if (*str1 > *str2) return 1; + if (*str1 < *str2) return -1; + return 0; } /*********************************************************************

1 0