wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Jacek Caban : gdi32: Use ntgdi names for GetBoundsRect and SetBoundsRect.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 057b6404ba27164954215db54e91cc6a6202f814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057b6404ba27164954215db5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 10:03:26 2021 +0200 gdi32: Use ntgdi names for GetBoundsRect and SetBoundsRect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 10 +++++----- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index afa4247cf9e..ca06c845b1b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -494,7 +494,7 @@ static BOOL reset_dc_state( HDC hdc ) NtGdiSelectPen( hdc, GetStockObject( BLACK_PEN )); SetVirtualResolution( hdc, 0, 0, 0, 0 ); GDISelectPalette( hdc, GetStockObject( DEFAULT_PALETTE ), FALSE ); - SetBoundsRect( hdc, NULL, DCB_DISABLE ); + NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); AbortPath( hdc ); if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); @@ -1206,9 +1206,9 @@ BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr ) /*********************************************************************** - * GetBoundsRect (GDI32.@) + * NtGdiGetBoundsRect (win32u.@) */ -UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) +UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags ) { PHYSDEV physdev; RECT device_rect; @@ -1253,9 +1253,9 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) /*********************************************************************** - * SetBoundsRect (GDI32.@) + * NtGdiSetBoundsRect (win32u.@) */ -UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) +UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags ) { PHYSDEV physdev; UINT ret; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5995396abe7..626463fe2f7 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -244,7 +244,7 @@ @ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) -@ stdcall GetBoundsRect(long ptr long) +@ stdcall GetBoundsRect(long ptr long) NtGdiGetBoundsRect # @ stub GetBrushAttributes @ stdcall GetBrushOrgEx(long ptr) @ stdcall GetCharABCWidthsA(long long long ptr) @@ -478,7 +478,7 @@ @ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) -@ stdcall SetBoundsRect(long ptr long) +@ stdcall SetBoundsRect(long ptr long) NtGdiSetBoundsRect # @ stub SetBrushAttributes @ stdcall SetBrushOrgEx(long long long ptr) @ stdcall SetColorAdjustment(long ptr)

1 0

Jacek Caban : gdi32: Use ntgdi names for GetDeviceGammaRamp and SetDeviceGammaRamp.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 42851bd13b8611f45ef88391bac04f0b038e715d URL: https://source.winehq.org/git/wine.git/?a=commit;h=42851bd13b8611f45ef88391… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 10:03:17 2021 +0200 gdi32: Use ntgdi names for GetDeviceGammaRamp and SetDeviceGammaRamp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 20 ++++++++++---------- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1faf83b3201..afa4247cf9e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1081,17 +1081,17 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) } /*********************************************************************** - * GetDeviceGammaRamp (GDI32.@) + * NtGdiGetDeviceGammaRamp (win32u.@) */ -BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) +BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hDC ); + DC *dc = get_dc_ptr( hdc ); - TRACE("%p, %p\n", hDC, ptr); + TRACE("%p, %p\n", hdc, ptr); if( dc ) { - if (GetObjectType( hDC ) != OBJ_MEMDC) + if (GetObjectType( hdc ) != OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); @@ -1181,17 +1181,17 @@ static BOOL check_gamma_ramps(void *ptr) } /*********************************************************************** - * SetDeviceGammaRamp (GDI32.@) + * NtGdiSetDeviceGammaRamp (win32u.@) */ -BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) +BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hDC ); + DC *dc = get_dc_ptr( hdc ); - TRACE("%p, %p\n", hDC, ptr); + TRACE( "%p, %p\n", hdc, ptr ); if( dc ) { - if (GetObjectType( hDC ) != OBJ_MEMDC) + if (GetObjectType( hdc ) != OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6b1d0952bf2..5995396abe7 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -275,7 +275,7 @@ @ stdcall GetDIBColorTable(long long long ptr) @ stdcall GetDIBits(long long long long ptr ptr long) @ stdcall GetDeviceCaps(long long) -@ stdcall GetDeviceGammaRamp(long ptr) +@ stdcall GetDeviceGammaRamp(long ptr) NtGdiGetDeviceGammaRamp @ stub GetETM # @ stub GetEUDCTimeStamp # @ stub GetEUDCTimeStampExW @@ -488,7 +488,7 @@ @ stdcall SetDIBColorTable(long long long ptr) @ stdcall SetDIBits(long long long long ptr ptr long) @ stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) -@ stdcall SetDeviceGammaRamp(long ptr) +@ stdcall SetDeviceGammaRamp(long ptr) NtGdiSetDeviceGammaRamp @ stdcall SetEnhMetaFileBits(long ptr) @ stub SetFontEnumeration @ stdcall SetGraphicsMode(long long)

1 0

Nikolay Sivov : mf/tests: Add some tests for EVR stream services.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: d3b9ff2efd49addf2a4a19d7505b0170dcfc81b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b9ff2efd49addf2a4a19d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 20:37:53 2021 +0300 mf/tests: Add some tests for EVR stream services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c8c7e0569cc..4b894df1de0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4273,6 +4273,7 @@ static void test_evr(void) check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, FALSE); check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); @@ -4423,7 +4424,15 @@ static void test_evr(void) /* Stream uses an allocator. */ check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, TRUE); check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); - +todo_wine { + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(stream_sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); +} hr = MFGetService((IUnknown *)stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Hugh McMaster : conhost: Set screen buffer height to 150 characters in registry defaults.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: cfb0d152ebe9d18feb990d5396061d8e1217c931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb0d152ebe9d18feb990d53… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 2 22:20:21 2021 +1000 conhost: Set screen buffer height to 150 characters in registry defaults. This matches the defaults in create_screen_buffer(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3af80383958..4033eefa313 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -256,7 +256,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) config->menu_mask = 0; config->popup_attr = 0xF5; config->quick_edit = 0; - config->sb_height = 25; + config->sb_height = 150; config->sb_width = 80; config->attr = 0x000F; config->win_height = 25;

1 0

Hugh McMaster : conhost: Remove duplicate lines from current_config().
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 30edd84929e4defabb31c6e4b193822dacf95455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30edd84929e4defabb31c6e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 2 22:20:20 2021 +1000 conhost: Remove duplicate lines from current_config(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 92970b44f0e..3af80383958 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1925,8 +1925,6 @@ static void current_config( struct console *console, struct console_config *conf config->popup_attr = console->active->popup_attr; memcpy( config->color_map, console->active->color_map, sizeof(config->color_map) ); - config->win_height = console->active->win.bottom - console->active->win.top + 1; - config->win_width = console->active->win.right - console->active->win.left + 1; config->cell_width = console->active->font.width; config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight;

1 0

Francois Gouget : ntdll: Improve the Nt{Query,Set}TimerResolution() stubs.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: d84e84c12650ce7c6d22ba3105f57b0115030e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d84e84c12650ce7c6d22ba31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 29 17:24:17 2021 +0200 ntdll: Improve the Nt{Query,Set}TimerResolution() stubs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 8 +++--- dlls/ntdll/tests/time.c | 60 ++++++++++++++++++++++---------------------- dlls/ntdll/unix/sync.c | 28 ++++++++++++++++++--- 3 files changed, 58 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d84e84c12650ce7c6d22…

1 0

Francois Gouget : ntdll/tests: Add some Nt{Query,Set}TimerResolution() tests.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 6015fee5b21870ddd57477843354173d2e7f9696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6015fee5b21870ddd5747784… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 29 17:24:15 2021 +0200 ntdll/tests: Add some Nt{Query,Set}TimerResolution() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index ee683e9a0aa..5f9c49989d8 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -216,6 +216,115 @@ static void test_RtlQueryPerformanceCounter(void) } #endif +#define CHECK_CURRENT_TIMER(expected) \ + do { \ + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution failed %x\n", status); \ + todo_wine ok(cur2 == (expected), "expected new timer resolution %u, got %u\n", (expected), cur2); \ + min2 = min + 10; \ + cur2 = min2 + 1; \ + max2 = cur2 + 1; \ + status = NtQueryTimerResolution(&min2, &max2, &cur2); \ + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed %x\n", status); \ + todo_wine ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); \ + todo_wine ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); \ + todo_wine ok(cur2 == expected, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", (expected), cur2); \ + } while (0) + +static void test_TimerResolution(void) +{ + ULONG min, max, cur, min2, max2, cur2, set; + NTSTATUS status; + + status = NtQueryTimerResolution(NULL, &max, &cur); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtQueryTimerResolution(NULL,,) success\n"); + + status = NtQueryTimerResolution(&min, NULL, &cur); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtQueryTimerResolution(,NULL,) success\n"); + + status = NtQueryTimerResolution(&min, &max, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtQueryTimerResolution(,,NULL) success\n"); + + min = 212121; + cur = min + 1; + max = cur + 1; + status = NtQueryTimerResolution(&min, &max, &cur); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + todo_wine ok(min == 156250 /* 1/64s HPET */ || min == 156001 /* RTC */, + "unexpected minimum timer resolution %u\n", min); + ok(0 < max, "invalid maximum timer resolution, should be 0 < %u\n", max); + todo_wine ok(max <= cur && cur <= min, "invalid timer resolutions, should be %u <= %u <= %u\n", max, cur, min); + + status = NtSetTimerResolution(0, FALSE, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution(,,NULL) success\n"); + + /* Nothing happens if that pointer is not good */ + status = NtSetTimerResolution(cur - 1, TRUE, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution() failed %x\n", status); + + min2 = min + 1; + cur2 = min2 + 1; + max2 = cur2 + 1; + status = NtQueryTimerResolution(&min2, &max2, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + todo_wine ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); + todo_wine ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); + todo_wine ok(cur2 == cur, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", cur, cur2); + + /* 'fails' until the first valid timer resolution request */ + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_TIMER_RESOLUTION_NOT_SET, "NtSetTimerResolution() failed %x\n", status); + /* and returns the current timer resolution */ + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", cur, cur2); + + + cur2 = 7654321; + status = NtSetTimerResolution(max - 1, TRUE, &cur2); + CHECK_CURRENT_TIMER(max); + + /* Rescinds our timer resolution request */ + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + /* -> the timer resolution was reset to its initial value */ + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", min, cur2); + + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_TIMER_RESOLUTION_NOT_SET, "NtSetTimerResolution() failed %x\n", status); + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", cur, cur2); + + cur2 = 7654321; + status = NtSetTimerResolution(min + 1, TRUE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + /* This works because: + * - Either cur is the minimum (15.6 ms) resolution already, i.e. the + * closest valid value 'set' is rounded to. + * - Or some other application requested a higher timer resolution, cur, + * and any attempt to lower the resolution has no effect until that + * request is rescinded (hopefully after this test is done). + */ + CHECK_CURRENT_TIMER(cur); + + /* The requested resolution may (win7) or may not be rounded */ + cur2 = 7654321; + set = max < cur ? cur - 1 : max; + status = NtSetTimerResolution(set, TRUE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + todo_wine ok(cur2 <= set, "expected new timer resolution %u <= %u\n", cur2, set); + trace("timer resolution: %u(max) <= %u(cur) <= %u(prev) <= %u(min)\n", max, cur2, cur, min); + + cur2 = 7654321; + status = NtSetTimerResolution(cur + 1, TRUE, &cur2); + CHECK_CURRENT_TIMER(cur); /* see min + 1 test */ + + /* Cleanup by rescinding the last request */ + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", set, cur2); +} + static void test_RtlQueryTimeZoneInformation(void) { RTL_DYNAMIC_TIME_ZONE_INFORMATION tzinfo, tzinfo2; @@ -379,4 +488,5 @@ START_TEST(time) #if defined(__i386__) || defined(__x86_64__) test_RtlQueryPerformanceCounter(); #endif + test_TimerResolution(); }

1 0

Francois Gouget : kernelbase/tests: Fix the Sleep() test for non-default timer resolutions.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: e9e8561fa8127a354390cc49442d0b029c693014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e8561fa8127a354390cc49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 29 17:24:12 2021 +0200 kernelbase/tests: Fix the Sleep() test for non-default timer resolutions. Also defend against timer resolution changes during the test. Reduce the test duration a bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51533 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 50ce62602b0..8127b4238b9 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -19,10 +19,14 @@ */ #include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> -#include <stdlib.h> #include <winerror.h> +#include <winternl.h> #include "wine/test.h" @@ -176,7 +180,9 @@ static void test_Sleep(void) { LARGE_INTEGER frequency; LARGE_INTEGER t1, t2; - double elapsed_time; + double elapsed_time, min, max; + ULONG dummy, r1, r2; + NTSTATUS status; BOOL ret; int i; @@ -186,15 +192,30 @@ static void test_Sleep(void) ret = QueryPerformanceCounter(&t1); ok(ret, "QueryPerformanceCounter failed\n"); - for (i = 0; i < 100; i++) { + /* Get the timer resolution before... */ + r1 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r1); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + + for (i = 0; i < 50; i++) { Sleep(1); } ret = QueryPerformanceCounter(&t2); ok(ret, "QueryPerformanceCounter failed\n"); + /* ...and after in case some other process changes it during this test */ + r2 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r2); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; - todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 4.0, "got %f\n", elapsed_time); + min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0; + max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0; + + /* Add an extra 1s to account for potential scheduling delays */ + todo_wine ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max, + "got %f, expected between %f and %f\n", elapsed_time, min, max); } START_TEST(sync)

1 0

Alexandre Julliard : wow64: Add a thunk for the wine_server_call() syscall.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 8fed1c68098f521492d2bd28679745733f22238e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fed1c68098f521492d2bd28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 16:11:21 2021 +0200 wow64: Add a thunk for the wine_server_call() syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 20 ++++++++++++++++++++ dlls/wow64/syscall.c | 25 +++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + 3 files changed, 46 insertions(+) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 419575c2ede..dd5814f431b 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -21,6 +21,8 @@ #ifndef __WOW64_STRUCT32_H #define __WOW64_STRUCT32_H +#include "wine/server.h" + typedef struct { ULONG Length; @@ -633,4 +635,22 @@ typedef struct SYSTEM_THREAD_INFORMATION32 ti[1]; } SYSTEM_PROCESS_INFORMATION32; +struct __server_iovec32 +{ + ULONG ptr; + data_size_t size; +}; + +struct __server_request_info32 +{ + union + { + union generic_request req; + union generic_reply reply; + } u; + unsigned int data_count; + ULONG reply_data; + struct __server_iovec32 data[__SERVER_MAX_DATA]; +}; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 29d358595b0..2fd9f309b1b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -242,6 +242,31 @@ NTSTATUS WINAPI wow64_NtSetDefaultUILanguage( UINT *args ) } +/********************************************************************** + * wow64_wine_server_call + */ +NTSTATUS WINAPI wow64_wine_server_call( UINT *args ) +{ + struct __server_request_info32 *req32 = get_ptr( &args ); + + unsigned int i; + NTSTATUS status; + struct __server_request_info req; + + req.u.req = req32->u.req; + req.data_count = req32->data_count; + for (i = 0; i < req.data_count; i++) + { + req.data[i].ptr = ULongToPtr( req32->data[i].ptr ); + req.data[i].size = req32->data[i].size; + } + req.reply_data = ULongToPtr( req32->reply_data ); + status = wine_server_call( &req ); + req32->u.reply = req.u.reply; + return status; +} + + /********************************************************************** * get_syscall_num */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 765456a8ab7..782a7a78c18 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -235,6 +235,7 @@ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ + SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_unix_to_nt_file_name ) #endif /* __WOW64_SYSCALL_H */

1 0

Alexandre Julliard : wow64: Add thunks for the wine_nt_to_unix_file_name and wine_unix_to_nt_file_name syscalls.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 580ad3898be1dc4f69134218118d561fec35f210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580ad3898be1dc4f69134218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 15:57:08 2021 +0200 wow64: Add thunks for the wine_nt_to_unix_file_name and wine_unix_to_nt_file_name syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 29 +++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 +++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 05c8a97de0c..dab9827165f 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -856,3 +856,32 @@ NTSTATUS WINAPI wow64_NtWriteFileGather( UINT *args ) put_iosb( io32, &io ); return status; } + + +/********************************************************************** + * wow64_wine_nt_to_unix_file_name + */ +NTSTATUS WINAPI wow64_wine_nt_to_unix_file_name( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + char *nameA = get_ptr( &args ); + ULONG *size = get_ptr( &args ); + UINT disposition = get_ulong( &args ); + + struct object_attr64 attr; + + return wine_nt_to_unix_file_name( objattr_32to64_redirect( &attr, attr32 ), nameA, size, disposition ); +} + + +/********************************************************************** + * wow64_wine_unix_to_nt_file_name + */ +NTSTATUS WINAPI wow64_wine_unix_to_nt_file_name( UINT *args ) +{ + const char *name = get_ptr( &args ); + WCHAR *buffer = get_ptr( &args ); + ULONG *size = get_ptr( &args ); + + return wine_unix_to_nt_file_name( name, buffer, size ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 161acb83188..765456a8ab7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -233,6 +233,8 @@ SYSCALL_ENTRY( NtWriteFile ) \ SYSCALL_ENTRY( NtWriteFileGather ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ - SYSCALL_ENTRY( NtYieldExecution ) + SYSCALL_ENTRY( NtYieldExecution ) \ + SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ + SYSCALL_ENTRY( wine_unix_to_nt_file_name ) #endif /* __WOW64_SYSCALL_H */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021