November 2019 - Wine-commits

Zebediah Figura : strmbase: Swap the lock order in IPin::EndFlush().
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: a4131ca625cf7b1c76ba8f230dda7c6b9d682bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4131ca625cf7b1c76ba8f23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 17:35:41 2019 -0600 strmbase: Swap the lock order in IPin::EndFlush(). This more closely resembles the threading model prescribed by the DirectX SDK documentation. In particular, the page "Flushing Data" recommends that IPin::BeginFlush() do the following steps in order: 1. take the filter lock 2. signal the streaming thread to complete 3. take the streaming lock, if necessary Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0ef9c5b225..cacbb90e59 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -133,8 +133,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) TRACE("iface %p.\n", iface); - EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); + EnterCriticalSection(&pFilter->csRenderLock); pFilter->eos = FALSE; hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) @@ -146,8 +146,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) if (pFilter->pFuncsTable->pfnEndFlush) hr = pFilter->pFuncsTable->pfnEndFlush(pFilter); } - LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); + LeaveCriticalSection(&pFilter->filter.csFilter); return hr; }

1 0

Zebediah Figura : kernelbase: Implement GetOverlappedResultEx().
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 216530f230d270c6bc86f9254f37ed58b843e44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=216530f230d270c6bc86f925… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 18:19:21 2019 -0600 kernelbase: Implement GetOverlappedResultEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38830 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-io-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/pipe.c | 54 ++++++++++++++++++++++ dlls/kernelbase/file.c | 23 +++++++-- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec index 907c0b4a97..87039aef0c 100644 --- a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -4,7 +4,7 @@ @ stdcall CreateIoCompletionPort(long long long long) kernel32.CreateIoCompletionPort @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult -@ stub GetOverlappedResultEx +@ stdcall GetOverlappedResultEx(long ptr ptr long long) kernel32.GetOverlappedResultEx @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus @ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 82e10850a8..172be2a6e2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -760,6 +760,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) +@ stdcall -import GetOverlappedResultEx(long ptr ptr long long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFullName(long ptr ptr) @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index d8d5726f1a..20f3450c6d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -42,6 +42,7 @@ static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetOverlappedResultEx)(HANDLE,OVERLAPPED *,DWORD *,DWORD,BOOL); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -4065,6 +4066,57 @@ static void test_nowait(DWORD pipe_type) ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); } +static void test_GetOverlappedResultEx(void) +{ + HANDLE client, server; + OVERLAPPED ovl; + char buffer[8000]; + DWORD ret_size; + BOOL ret; + + if (!pGetOverlappedResultEx) + { + win_skip("GetOverlappedResultEx() is not available\n"); + return; + } + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + overlapped_write_async(client, buffer, sizeof(buffer), &ovl); + + user_apc_ran = FALSE; + QueueUserAPC(user_apc, GetCurrentThread(), 0); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_IO_COMPLETION, "wrong error %u\n", GetLastError()); + ok(user_apc_ran, "APC should have run\n"); + + CloseHandle(ovl.hEvent); + + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -4080,6 +4132,7 @@ START_TEST(pipe) pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); + pGetOverlappedResultEx = (void *)GetProcAddress(hmod, "GetOverlappedResultEx"); argc = winetest_get_mainargs(&argv); @@ -4134,4 +4187,5 @@ START_TEST(pipe) test_wait_pipe(); test_nowait(PIPE_TYPE_BYTE); test_nowait(PIPE_TYPE_MESSAGE); + test_GetOverlappedResultEx(); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index aa2ebfcc69..77a7398580 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2002,21 +2002,38 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileType( HANDLE file ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResult( HANDLE file, LPOVERLAPPED overlapped, LPDWORD result, BOOL wait ) +{ + return GetOverlappedResultEx( file, overlapped, result, wait ? INFINITE : 0, FALSE ); +} + + +/*********************************************************************** + * GetOverlappedResultEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *overlapped, + DWORD *result, DWORD timeout, BOOL alertable ) { NTSTATUS status; + DWORD ret; - TRACE( "(%p %p %p %x)\n", file, overlapped, result, wait ); + TRACE( "(%p %p %p %u %d)\n", file, overlapped, result, timeout, alertable ); status = overlapped->Internal; if (status == STATUS_PENDING) { - if (!wait) + if (!timeout) { SetLastError( ERROR_IO_INCOMPLETE ); return FALSE; } - if (WaitForSingleObject( overlapped->hEvent ? overlapped->hEvent : file, INFINITE ) == WAIT_FAILED) + ret = WaitForSingleObjectEx( overlapped->hEvent ? overlapped->hEvent : file, timeout, alertable ); + if (ret == WAIT_FAILED) return FALSE; + else if (ret) + { + SetLastError( ret ); + return FALSE; + } status = overlapped->Internal; if (status == STATUS_PENDING) status = STATUS_SUCCESS; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 14ee402089..ed5d1f73f8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -584,7 +584,7 @@ # @ stub GetOsManufacturingMode # @ stub GetOsSafeBootMode @ stdcall GetOverlappedResult(long ptr ptr long) -# @ stub GetOverlappedResultEx +@ stdcall GetOverlappedResultEx(long ptr ptr long long) # @ stub GetPackageApplicationContext # @ stub GetPackageApplicationIds # @ stub GetPackageApplicationProperty diff --git a/include/winbase.h b/include/winbase.h index 8b30c5a69a..2d01dcb606 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2215,6 +2215,7 @@ WINBASEAPI BOOL WINAPI GetNumaProximityNodeEx(ULONG,PUSHORT); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL); +WINBASEAPI BOOL WINAPI GetOverlappedResultEx(HANDLE,OVERLAPPED*,DWORD*,DWORD,BOOL); WINBASEAPI DWORD WINAPI GetPriorityClass(HANDLE); WINADVAPI BOOL WINAPI GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD); WINBASEAPI UINT WINAPI GetPrivateProfileIntA(LPCSTR,LPCSTR,INT,LPCSTR);

1 0

Zebediah Figura : ntoskrnl.exe: Remove a superfluous condition.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 993c833cf414d250bf380496f3aaf30f4a5e1e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=993c833cf414d250bf380496… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 19:29:46 2019 -0600 ntoskrnl.exe: Remove a superfluous condition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 365ddc069f..647d427ee5 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1251,7 +1251,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG lock->Common.Removed = TRUE; - if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); else if (count < 0) ERR("Lock %p is not acquired!\n", lock);

1 0

Francois Gouget : d3d9/tests: Fix a typo in a field name of the visual test.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: cb6f488215c7f589a6297c5ebdd8936ae6760343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6f488215c7f589a6297c5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:22:42 2019 +0100 d3d9/tests: Fix a typo in a field name of the visual test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f063d21fb..cbfb98bec6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26311,7 +26311,7 @@ static void test_sample_attached_rendertarget(void) static const struct { - struct vec3 posistion; + struct vec3 position; struct vec2 texcoord; } quad[] =

1 0

Zebediah Figura : ddraw: Track some more render states in the primary stateblock.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: b29c7da5f06f9650c316106abc71cd59e2b83026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29c7da5f06f9650c316106a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 23:53:37 2019 -0600 ddraw: Track some more render states in the primary stateblock. 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/ddraw/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 51576c81e2..def3e7c2a4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3555,6 +3555,7 @@ static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD fla if (!device->material || !(fvf & D3DFVF_NORMAL) || (flags & D3DDP_DONOTLIGHT)) enable = FALSE; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_LIGHTING, enable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); } @@ -7033,11 +7034,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ + { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_COLORKEYENABLE, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); + } else if (version == 2) + { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_SPECULARENABLE, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); + } if (version < 7) { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_NORMALIZENORMALS, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE);

1 0

Alexandre Julliard : ntdll: Keep a valid DOS name if the initial current directory is a Unix dir.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: f2060812418bc049105c2a30ceb039ee6d5f0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2060812418bc049105c2a30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 19:16:56 2019 +0100 ntdll: Keep a valid DOS name if the initial current directory is a Unix dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48114 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 79a1805618..ebeda01ff8 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,8 +622,17 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - dir->Length = nt_name.Length - 4 * sizeof(WCHAR); - memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + { + dir->Length = nt_name.Length - 4 * sizeof(WCHAR); + memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + } + else /* change \??\ to \\?\ */ + { + dir->Length = nt_name.Length; + memcpy( dir->Buffer, nt_name.Buffer, dir->Length ); + dir->Buffer[1] = '\\'; + } RtlFreeUnicodeString( &nt_name ); } }

1 0

Francois Gouget : gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 40f5cffadde76fa1a6adc065f7d46b9411379180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f5cffadde76fa1a6adc065… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:08:46 2019 +0100 gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc. Windows 10 1507 still deleted it but 1607 no longer does. 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/gdi32/tests/metafile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c0..231d6a4d35 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2082,7 +2082,9 @@ static void test_mf_Blank(void) ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hMetafile); ok(type == OBJ_METAFILE, "CloseMetaFile created object with type %d\n", type); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) @@ -2249,6 +2251,7 @@ static void test_mf_Graphics(void) HDC hdcMetafile; HMETAFILE hMetafile; POINT oldpoint; + INT type; BOOL ret; hdcMetafile = CreateMetaFileA(NULL); @@ -2275,7 +2278,9 @@ static void test_mf_Graphics(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2296,6 +2301,7 @@ static void test_mf_PatternBrush(void) LOGBRUSH *orig_lb; HBRUSH hBrush; BOOL ret; + INT type; orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); @@ -2316,7 +2322,9 @@ static void test_mf_PatternBrush(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_PATTERN_BRUSH_BITS, sizeof(MF_PATTERN_BRUSH_BITS), "mf_Pattern_Brush") != 0)

1 0

Jeff Smith : ucrtbase: Add support for strftime format %r.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: c6bafaa6d92b78c82be5b955cae455f581750a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bafaa6d92b78c82be5b955… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 28 01:57:42 2019 -0600 ucrtbase: Add support for strftime format %r. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 28 ++++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4283566102..ef4f228554 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1386,6 +1386,34 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; #if _MSVCR_VER>=140 + case 'r': + if(time_data == MSVCRT_locale->locinfo->lc_time_curr) + { + if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) + goto einval_error; + if(!strftime_int(str, &ret, max, (mstm->tm_hour + 11) % 12 + 1, + alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS)) + return 0; + if(ret < max) + str[ret++] = ' '; + if(!strftime_str(str, &ret, max, mstm->tm_hour<12 ? + STRFTIME_TD(time_data, am) : STRFTIME_TD(time_data, pm))) + return 0; + } + else + { + if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) + return 0; + } + break; case 'R': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c1ab7f216a..083be42f42 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -974,8 +974,10 @@ static void test_strftime(void) {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE, TRUE}, + {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, + {"%#r", "12:0:0 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#r", "2:0:0 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 3, 364, 0 }}, @@ -1077,6 +1079,7 @@ static void test_strftime(void) { "%#x", "y70", 0, L"yyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "1970", 0, L"yyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "y1970", 0, L"yyyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%r", "z", L"x", L"y", L"z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, }; const struct {

1 0

Chip Davis : ntdll: Fix tick count calculation on Mac.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 289d456dd617c164047b6562b993a7c1a7955232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=289d456dd617c164047b6562… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 27 09:54:09 2019 -0600 ntdll: Fix tick count calculation on Mac. Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/kernel32/time.c | 4 ++++ dlls/ntdll/time.c | 4 ++++ include/config.h.in | 3 +++ server/request.c | 4 ++++ 6 files changed, 17 insertions(+) diff --git a/configure b/configure index dc23826900..90ff22fc7e 100755 --- a/configure +++ b/configure @@ -17696,6 +17696,7 @@ for ac_func in \ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/configure.ac b/configure.ac index fe2816ca7b..7f2c3cda23 100644 --- a/configure.ac +++ b/configure.ac @@ -2171,6 +2171,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 817a830518..716230aa7a 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -78,6 +78,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b87..4e3d5583c7 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/include/config.h.in b/include/config.h.in index 41a7cde553..63396e9250 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -554,6 +554,9 @@ /* Define to 1 if you have the <machine/sysarch.h> header file. */ #undef HAVE_MACHINE_SYSARCH_H +/* Define to 1 if you have the `mach_continuous_time' function. */ +#undef HAVE_MACH_CONTINUOUS_TIME + /* Define to 1 if you have the <mach/machine.h> header file. */ #undef HAVE_MACH_MACHINE_H diff --git a/server/request.c b/server/request.c index d2adb08a18..5610d392cf 100644 --- a/server/request.c +++ b/server/request.c @@ -529,6 +529,10 @@ unsigned int get_tick_count(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 1000000; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts;

1 0

Francois Gouget : wbemprox: Fix the spelling of the free_associations() function name.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 81df49fadc25ef476b6cd6027b960cdf89c64b81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81df49fadc25ef476b6cd602… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:21:09 2019 +0100 wbemprox: Fix the spelling of the free_associations() function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53d4b169cd..1f8afb46fe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2600,7 +2600,7 @@ struct association WCHAR *ref2; }; -static void free_assocations( struct association *assoc, UINT count ) +static void free_associations( struct association *assoc, UINT count ) { UINT i; if (!assoc) return; @@ -2652,7 +2652,7 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2668,12 +2668,12 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } @@ -2953,7 +2953,7 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2969,12 +2969,12 @@ static enum fill_status fill_logicaldisktopartition( struct table *table, const if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; }

1 0