May 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/vmr9: Allow the aspect ratio parameters to be NULL in IVMRWindowlessControl9::GetNativeVideoSize().
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 45789e00dad69a2609b6a104b71731fe483428b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45789e00dad69a2609b6a104… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 22:30:09 2020 -0500 quartz/vmr9: Allow the aspect ratio parameters to be NULL in IVMRWindowlessControl9::GetNativeVideoSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 6 +++--- dlls/quartz/vmr9.c | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index fc2794c5cb..93c2e504a0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3808,9 +3808,9 @@ static void test_windowless_size(void) width = height = 0xdeadbeef; hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(width == 32, "Got width %d.\n", width); - todo_wine ok(height == 16, "Got height %d.\n", height); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(width == 32, "Got width %d.\n", width); + ok(height == 16, "Got height %d.\n", height); aspect_width = aspect_height = 0xdeadbeef; hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, &aspect_width, &aspect_height); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c7ebdc6c57..44ad296512 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1615,21 +1615,23 @@ static ULONG WINAPI VMR9WindowlessControl_Release(IVMRWindowlessControl9 *iface) return IUnknown_Release(This->renderer.filter.outer_unk); } -static HRESULT WINAPI VMR9WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height, LONG *arwidth, LONG *arheight) +static HRESULT WINAPI VMR9WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl9 *iface, + LONG *width, LONG *height, LONG *aspect_width, LONG *aspect_height) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); - TRACE("(%p/%p)->(%p, %p, %p, %p)\n", iface, This, width, height, arwidth, arheight); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - if (!width || !height || !arwidth || !arheight) - { - ERR("Got no pointer\n"); + TRACE("filter %p, width %p, height %p, aspect_width %p, aspect_height %p.\n", + filter, width, height, aspect_width, aspect_height); + + if (!width || !height) return E_POINTER; - } - *width = This->bmiheader.biWidth; - *height = This->bmiheader.biHeight; - *arwidth = This->bmiheader.biWidth; - *arheight = This->bmiheader.biHeight; + *width = filter->bmiheader.biWidth; + *height = filter->bmiheader.biHeight; + if (aspect_width) + *aspect_width = filter->bmiheader.biWidth; + if (aspect_height) + *aspect_height = filter->bmiheader.biHeight; return S_OK; }

1 0

Rémi Bernon : ntdll: Reduce USD section size to 0x1000.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 16e32e3b771c1f29c3ec8ea57318cfbc5e3d15f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e32e3b771c1f29c3ec8ea5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 11 13:12:49 2020 +0200 ntdll: Reduce USD section size to 0x1000. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 1 - dlls/ntdll/thread.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5e9aa1343c..7a641f8b84 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2266,7 +2266,6 @@ static void test_queryvirtualmemory(void) ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x\n", mbi.Protect); ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_PRIVATE); - todo_wine ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%lx, expected 0x%x\n", mbi.RegionSize, 0x1000); /* check error code when addr is higher than working set limit */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 78fe4e4fdf..0fc8aa9e92 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -294,7 +294,7 @@ TEB *thread_init(void) /* reserve space for shared user data */ addr = (void *)0x7ffe0000; - size = 0x10000; + size = 0x1000; status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); if (status)

1 0

Rémi Bernon : ntdll/tests: Add tests for USD memory basic info.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: dadf93f4098b42015f8c53539c9b22054c4b08d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dadf93f4098b42015f8c5353… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 11 13:12:47 2020 +0200 ntdll/tests: Add tests for USD memory basic info. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e28eefa986..8dde29d00a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2181,6 +2181,7 @@ static void test_queryvirtualmemory(void) MEMORY_BASIC_INFORMATION mbi; char stackbuf[42]; HMODULE module; + void *user_shared_data = (void *)0x7ffe0000; module = GetModuleHandleA( "ntdll.dll" ); trace("Check flags of the PE header of NTDLL.DLL at %p\n", module); @@ -2255,6 +2256,20 @@ static void test_queryvirtualmemory(void) } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ + trace("Check flags of user shared data at %p\n", user_shared_data); + status = pNtQueryVirtualMemory(NtCurrentProcess(), user_shared_data, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok(mbi.AllocationBase == user_shared_data, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, user_shared_data); + todo_wine + ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY); + ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); + todo_wine + ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x\n", mbi.Protect); + ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_PRIVATE); + todo_wine + ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%lx, expected 0x%x\n", mbi.RegionSize, 0x1000); + /* check error code when addr is higher than working set limit */ status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);

1 0

Rémi Bernon : server: Add USD support with timestamp updates.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: a1c46c3806a054c16fab9fd9d8388e55eb473536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c46c3806a054c16fab9fd9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 11 13:12:48 2020 +0200 server: Add USD support with timestamp updates. The USD page is created when the first process (wineboot.exe) completes its creation, using its provided user_shared_data for initialization. The server maps the page write-only and the clients map it read-only, then the server updates the timestamps every 16 ms. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29168 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 4 +++ dlls/ntdll/tests/info.c | 1 - dlls/ntdll/tests/time.c | 9 ++++-- dlls/ntdll/thread.c | 60 ++++++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/instr.c | 12 -------- include/wine/server_protocol.h | 4 ++- server/file.h | 2 ++ server/mapping.c | 63 ++++++++++++++++++++++++++++++++++++++++++ server/process.c | 8 ++++++ server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + 13 files changed, 151 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c46c3806a054c16fab…

1 0

Zebediah Figura : quartz/vmr9: Check for D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 32be179a9646292b79e5795c0bc3d8e34e0ec7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32be179a9646292b79e5795c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 22:30:14 2020 -0500 quartz/vmr9: Check for D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 32af06e5fa..5ff6346733 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2551,7 +2551,9 @@ static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_ou static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9AllocationInfo *info, DWORD *numbuffers) { D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; DWORD d3d9_adapter; + D3DCAPS9 caps; HWND window; HRESULT hr; @@ -2573,12 +2575,23 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation d3dpp.BackBufferWidth = info->dwWidth; d3dpp.BackBufferHeight = info->dwHeight; - hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter, D3DDEVTYPE_HAL, NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); + hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter, D3DDEVTYPE_HAL, + NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { ERR("Could not create device: %08x\n", hr); return FALSE; } + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + if (!(caps.DevCaps2 & D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES)) + { + WARN("Device does not support blitting from textures.\n"); + IDirect3DDevice9_Release(device); + return FALSE; + } + + This->d3d9_dev = device; IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); if (!(This->d3d9_surfaces = calloc(*numbuffers, sizeof(IDirect3DSurface9 *))))

1 0

Akihiro Sagawa : winegstreamer: Unref the GstCaps object in init_new_decoded_pad().
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 49c33c920ecff329d7e2ea5b4a2ebd67234f25d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49c33c920ecff329d7e2ea5b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue May 12 22:34:09 2020 +0900 winegstreamer: Unref the GstCaps object in init_new_decoded_pad(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7038cef9b3..299a7ddf56 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1003,7 +1003,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); - return; + goto out; } if (!strcmp(typename, "video/x-raw")) @@ -1017,7 +1017,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", 8 * (int)sizeof(void *)); - return; + goto out; } /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ @@ -1025,7 +1025,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { ERR("Failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", 8 * (int)sizeof(void *)); - return; + goto out; } gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ @@ -1051,7 +1051,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { ERR("Failed to create audioconvert, are %u-bit GStreamer \"base\" plugins installed?\n", 8 * (int)sizeof(void *)); - return; + goto out; } gst_bin_add(GST_BIN(This->container), convert); @@ -1069,7 +1069,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * gst_pad_link_get_name(ret)); gst_object_unref(pin->post_sink); pin->post_sink = NULL; - return; + goto out; } if ((ret = gst_pad_link(pin->post_src, pin->my_sink)) < 0) @@ -1080,18 +1080,20 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * pin->post_src = NULL; gst_object_unref(pin->post_sink); pin->post_sink = NULL; - return; + goto out; } } else if ((ret = gst_pad_link(pad, pin->my_sink)) < 0) { ERR("Failed to link decodebin source pad to our sink pad, error %s.\n", gst_pad_link_get_name(ret)); - return; + goto out; } gst_pad_set_active(pin->my_sink, 1); gst_object_ref(pin->their_src = pad); +out: + gst_caps_unref(caps); } static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: a3e675f094f135ec1cf1b233493e16a75ddbf78a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e675f094f135ec1cf1b233… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 12 00:25:45 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 68e846e80e..5c1e8e960f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-03-31 23:40+0300\n" +"PO-Revision-Date: 2020-05-12 00:24+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3617,7 +3617,7 @@ msgstr "Žaidimų valdikliai" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Tikrinti ir konfigūruoti žaidimų valdiklius." #: jscript.rc:28 msgid "Error converting object to primitive type"

1 0

Rémi Bernon : ntdll/tests: Add tests for USD timestamp updates.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 89c242840d4ce2c27644a939f39c79e9deb3e02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c242840d4ce2c27644a939… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 11 13:12:46 2020 +0200 ntdll/tests: Add tests for USD timestamp updates. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8..d11093a243 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); static const int MonthLengths[2][12] = { @@ -153,6 +156,79 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static ULONGLONG read_ksystem_time(volatile KSYSTEM_TIME *time) +{ + ULONGLONG high, low; + do + { + high = time->High1Time; + low = time->LowPart; + } + while (high != time->High2Time); + return high << 32 | low; +} + +static void test_user_shared_data_time(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + ULONGLONG t1, t2, t3; + int i = 0; + + i = 0; + do + { + t1 = GetTickCount(); + if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) + t2 = (*(volatile ULONG*)&user_shared_data->TickCountLowDeprecated * (ULONG64)user_shared_data->TickCountMultiplier) >> 24; + else + t2 = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + t3 = GetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + todo_wine + ok(t2 <= t3, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + i = 0; + do + { + LARGE_INTEGER system_time; + NtQuerySystemTime(&system_time); + t1 = system_time.QuadPart; + t2 = read_ksystem_time(&user_shared_data->SystemTime); + NtQuerySystemTime(&system_time); + t3 = system_time.QuadPart; + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + if (!pRtlQueryUnbiasedInterruptTime) + win_skip("skipping RtlQueryUnbiasedInterruptTime tests\n"); + else + { + i = 0; + do + { + pRtlQueryUnbiasedInterruptTime(&t1); + t2 = read_ksystem_time(&user_shared_data->InterruptTime); + pRtlQueryUnbiasedInterruptTime(&t3); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, + "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -163,6 +239,7 @@ START_TEST(time) (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); + pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -170,4 +247,5 @@ START_TEST(time) win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); + test_user_shared_data_time(); }

1 0

Gijs Vermeulen : include: Fix SetupDiGetActualSectionToInstallExA/W definitions.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 1e32463a45d842f6b6fe7d6f22ca138b86078bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e32463a45d842f6b6fe7d6f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 11 15:39:18 2020 +0200 include: Fix SetupDiGetActualSectionToInstallExA/W definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/setupapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index 48060edf91..ac789ae215 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1516,8 +1516,8 @@ BOOL WINAPI SetupDiGetActualModelsSectionW(PINFCONTEXT, PSP_ALTPLATFORM_INFO BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF, PCSTR, PSTR, DWORD, PDWORD, PSTR *); BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF, PCWSTR, PWSTR, DWORD, PDWORD, PWSTR *); #define SetupDiGetActualSectionToInstall WINELIB_NAME_AW(SetupDiGetActualSectionToInstall) -BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF, PCSTR, PSTR, DWORD, PDWORD, PSTR *, PVOID); -BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF, PCWSTR, PWSTR, DWORD, PDWORD, PWSTR *, PVOID); +BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF, PCSTR, PSP_ALTPLATFORM_INFO, PSTR, DWORD, PDWORD, PSTR *, PVOID); +BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF, PCWSTR, PSP_ALTPLATFORM_INFO, PWSTR, DWORD, PDWORD, PWSTR *, PVOID); #define SetupDiGetActualSectionToInstallEx WINELIB_NAME_AW(SetupDiGetActualSectionToInstallEx) BOOL WINAPI SetupDiGetClassBitmapIndex(const GUID *, PINT); BOOL WINAPI SetupDiGetClassDescriptionA(const GUID*, PSTR, DWORD, PDWORD);

1 0

Gijs Vermeulen : setupapi: Add SetupDiGetActualSectionToInstallExA/W.
by Alexandre Julliard May 12, 2020

May 12, 2020

Module: wine Branch: master Commit: 9a044007cc712d13d5d63a4fea003926b91f36f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a044007cc712d13d5d63a4f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 11 18:22:57 2020 +0200 setupapi: Add SetupDiGetActualSectionToInstallExA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49130 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 115 ++++++++++++++++++++++++++------------------ dlls/setupapi/setupapi.spec | 2 + 2 files changed, 70 insertions(+), 47 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index fca60402a5..5674062909 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1845,18 +1845,18 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic } /*********************************************************************** - * SetupDiGetActualSectionToInstallA (SETUPAPI.@) + * SetupDiGetActualSectionToInstallExA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, - char *section_ext, DWORD size, DWORD *needed, char **extptr) +BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF hinf, const char *section, SP_ALTPLATFORM_INFO *altplatform, + char *section_ext, DWORD size, DWORD *needed, char **extptr, void *reserved) { WCHAR sectionW[LINE_LEN], section_extW[LINE_LEN], *extptrW; BOOL ret; MultiByteToWideChar(CP_ACP, 0, section, -1, sectionW, ARRAY_SIZE(sectionW)); - ret = SetupDiGetActualSectionToInstallW(hinf, sectionW, section_extW, - ARRAY_SIZE(section_extW), NULL, &extptrW); + ret = SetupDiGetActualSectionToInstallExW(hinf, sectionW, altplatform, section_extW, + ARRAY_SIZE(section_extW), NULL, &extptrW, reserved); if (ret) { if (needed) @@ -1879,72 +1879,93 @@ BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, } /*********************************************************************** - * SetupDiGetActualSectionToInstallW (SETUPAPI.@) + * SetupDiGetActualSectionToInstallA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetActualSectionToInstallW( - HINF InfHandle, - PCWSTR InfSectionName, - PWSTR InfSectionWithExt, - DWORD InfSectionWithExtSize, - PDWORD RequiredSize, - PWSTR *Extension) +BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, char *section_ext, + DWORD size, DWORD *needed, char **extptr) { - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - DWORD dwFullLength; - LONG lLineCount = -1; + return SetupDiGetActualSectionToInstallExA(hinf, section, NULL, section_ext, size, + needed, extptr, NULL); +} + +/*********************************************************************** + * SetupDiGetActualSectionToInstallExW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF hinf, const WCHAR *section, SP_ALTPLATFORM_INFO *altplatform, + WCHAR *section_ext, DWORD size, DWORD *needed, WCHAR **extptr, void *reserved) +{ + WCHAR buffer[MAX_PATH]; + DWORD len; + DWORD full_len; + LONG line_count = -1; + + TRACE("hinf %p, section %s, altplatform %p, ext %p, size %d, needed %p, extptr %p, reserved %p.\n", + hinf, debugstr_w(section), altplatform, section_ext, size, needed, extptr, reserved); + + if (altplatform) + FIXME("SP_ALTPLATFORM_INFO unsupported\n"); - lstrcpyW(szBuffer, InfSectionName); - dwLength = lstrlenW(szBuffer); + lstrcpyW(buffer, section); + len = lstrlenW(buffer); if (OsVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) { - /* Test section name with '.NTx86' extension */ - lstrcpyW(&szBuffer[dwLength], NtPlatformExtension); - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); + /* Test section name with '.NTx86' extension */ + lstrcpyW(&buffer[len], NtPlatformExtension); + line_count = SetupGetLineCountW(hinf, buffer); - if (lLineCount == -1) - { - /* Test section name with '.NT' extension */ - lstrcpyW(&szBuffer[dwLength], NtExtension); - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); - } + if (line_count == -1) + { + /* Test section name with '.NT' extension */ + lstrcpyW(&buffer[len], NtExtension); + line_count = SetupGetLineCountW(hinf, buffer); + } } else { - /* Test section name with '.Win' extension */ - lstrcpyW(&szBuffer[dwLength], WinExtension); - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); + /* Test section name with '.Win' extension */ + lstrcpyW(&buffer[len], WinExtension); + line_count = SetupGetLineCountW(hinf, buffer); } - if (lLineCount == -1) - szBuffer[dwLength] = 0; + if (line_count == -1) + buffer[len] = 0; - dwFullLength = lstrlenW(szBuffer); + full_len = lstrlenW(buffer); - if (InfSectionWithExt != NULL && InfSectionWithExtSize != 0) + if (section_ext != NULL && size != 0) { - if (InfSectionWithExtSize < (dwFullLength + 1)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } + if (size < (full_len + 1)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } - lstrcpyW(InfSectionWithExt, szBuffer); - if (Extension != NULL) - { - *Extension = (dwLength == dwFullLength) ? NULL : &InfSectionWithExt[dwLength]; - } + lstrcpyW(section_ext, buffer); + if (extptr != NULL) + { + *extptr = (len == full_len) ? NULL : &section_ext[len]; + } } - if (RequiredSize != NULL) + if (needed != NULL) { - *RequiredSize = dwFullLength + 1; + *needed = full_len + 1; } return TRUE; } +/*********************************************************************** + * SetupDiGetActualSectionToInstallW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF hinf, const WCHAR *section, WCHAR *section_ext, + DWORD size, DWORD *needed, WCHAR **extptr) +{ + return SetupDiGetActualSectionToInstallExW(hinf, section, NULL, section_ext, size, + needed, extptr, NULL); +} + /*********************************************************************** * SetupDiGetClassDescriptionA (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 43b837ca9e..26b4a6f7fb 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -316,6 +316,8 @@ @ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) +@ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) @ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr)

1 0