March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite/layout: Reuse glyph origins calculation helper to get run boxes.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: f4d84acf26d9e1de0a7ea59f7200fca536fc58ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d84acf26d9e1de0a7ea59f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 14:06:17 2021 +0300 dwrite/layout: Reuse glyph origins calculation helper to get run boxes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 06ebcb8057c..eb6280d7fc1 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3925,33 +3925,45 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout { const struct regular_layout_run *regular = &run->run->u.regular; UINT32 start_glyph = regular->clustermap[run->start]; - const DWRITE_GLYPH_RUN *glyph_run = &regular->run; - D2D1_POINT_2F origin = { 0 }; - float rtl_factor; - UINT32 i; + D2D1_POINT_2F baseline_origin = { 0 }, *origins; + DWRITE_GLYPH_RUN glyph_run; + unsigned int i; + HRESULT hr; if (run->bbox.top == run->bbox.bottom) { struct dwrite_glyphbitmap glyph_bitmap; RECT *bbox; + glyph_run = regular->run; + glyph_run.glyphCount = run->glyphcount; + glyph_run.glyphIndices = &regular->run.glyphIndices[start_glyph]; + glyph_run.glyphAdvances = &regular->run.glyphAdvances[start_glyph]; + glyph_run.glyphOffsets = &regular->run.glyphOffsets[start_glyph]; + memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); - glyph_bitmap.key = glyph_run->fontFace; - glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run->fontFace); - glyph_bitmap.emsize = glyph_run->fontEmSize; + glyph_bitmap.key = glyph_run.fontFace; + glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run.fontFace); + glyph_bitmap.emsize = glyph_run.fontEmSize; glyph_bitmap.nohint = layout->measuringmode == DWRITE_MEASURING_MODE_NATURAL; bbox = &glyph_bitmap.bbox; - rtl_factor = glyph_run->bidiLevel & 1 ? -1.0f : 1.0f; - for (i = 0; i < run->glyphcount; i++) { - D2D1_RECT_F glyph_bbox; + if (!(origins = heap_calloc(glyph_run.glyphCount, sizeof(*origins)))) + return; - /* FIXME: take care of vertical/rtl */ - if (glyph_run->bidiLevel & 1) - origin.x -= glyph_run->glyphAdvances[i + start_glyph]; + if (FAILED(hr = compute_glyph_origins(&glyph_run, layout->measuringmode, baseline_origin, &layout->transform, origins))) + { + WARN("Failed to compute glyph origins, hr %#x.\n", hr); + heap_free(origins); + return; + } - glyph_bitmap.glyph = glyph_run->glyphIndices[i + start_glyph]; + for (i = 0; i < glyph_run.glyphCount; ++i) + { + D2D1_RECT_F glyph_bbox; + + glyph_bitmap.glyph = glyph_run.glyphIndices[i]; dwrite_fontface_get_glyph_bbox(&glyph_bitmap); glyph_bbox.left = bbox->left; @@ -3959,14 +3971,11 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout glyph_bbox.right = bbox->right; glyph_bbox.bottom = bbox->bottom; - d2d_rect_offset(&glyph_bbox, origin.x + rtl_factor * glyph_run->glyphOffsets[i + start_glyph].advanceOffset, - origin.y - glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); - + d2d_rect_offset(&glyph_bbox, origins[i].x, origins[i].y); d2d_rect_union(&run->bbox, &glyph_bbox); + } - if (!(glyph_run->bidiLevel & 1)) - origin.x += glyph_run->glyphAdvances[i + start_glyph]; - } + heap_free(origins); } *bbox = run->bbox;

1 0

Hans Leidekker : dnsapi: Build with msvcrt.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 5ad5be894d84dc49d5a5a274f68898eac9316ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ad5be894d84dc49d5a5a274… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:29 2021 +0200 dnsapi: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 2 ++ dlls/dnsapi/name.c | 27 +++++++-------------------- dlls/dnsapi/record.c | 19 +++++++++---------- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index a4f80e83fd4..ae00cf73a9f 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = dnsapi IMPORTS = netapi32 EXTRALIBS = $(RESOLV_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ libresolv.c \ main.c \ diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index 4f4ba507cac..e76763e7289 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -27,7 +27,6 @@ #include "windns.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); @@ -67,23 +66,13 @@ BOOL WINAPI DnsNameCompare_W( PCWSTR name1, PCWSTR name2 ) if (!name1 && !name2) return TRUE; if (!name1 || !name2) return FALSE; - p = name1 + lstrlenW( name1 ) - 1; - q = name2 + lstrlenW( name2 ) - 1; + p = name1 + lstrlenW( name1 ); + q = name2 + lstrlenW( name2 ); - while (*p == '.' && p >= name1) p--; - while (*q == '.' && q >= name2) q--; + while (p > name1 && p[-1] == '.') p--; + while (q > name2 && q[-1] == '.') q--; - if (p - name1 != q - name2) return FALSE; - - while (name1 <= p) - { - if (toupperW( *name1 ) != toupperW( *name2 )) - return FALSE; - - name1++; - name2++; - } - return TRUE; + return CompareStringOrdinal( name1, p - name1, name2, q - name2, TRUE ) == CSTR_EQUAL; } /****************************************************************************** @@ -141,9 +130,7 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) { PCWSTR p; unsigned int i, j, state = 0; - static const WCHAR invalid[] = { - '{','|','}','~','[','\\',']','^','\'',':',';','<','=','>', - '?','@','!','\"','#','$','%','^','`','(',')','+','/',',',0 }; + static const WCHAR invalid[] = L"{|}~[\\]^':;<=>?@!\"#$%&`()+/,"; TRACE( "(%s, %d)\n", debugstr_w(name), format ); @@ -162,7 +149,7 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) if (j > 62) state |= HAS_LONG_LABEL; - if (strchrW( invalid, *p )) state |= HAS_INVALID; + if (wcschr( invalid, *p )) state |= HAS_INVALID; else if ((unsigned)*p > 127) state |= HAS_EXTENDED; else if (*p == ' ') state |= HAS_SPACE; else if (*p == '_') state |= HAS_UNDERSCORE; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 4697438df57..5a75503d892 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -25,7 +25,6 @@ #include "windns.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); @@ -450,8 +449,8 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.MINFO); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + - (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (wcslen( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -463,7 +462,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.MX); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -473,7 +472,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.NXT); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -490,7 +489,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.PTR); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -500,7 +499,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.SIG); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -517,8 +516,8 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.SOA); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + - (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (wcslen( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -528,7 +527,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.SRV); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default:

1 0

Hans Leidekker : dnsapi: Move libresolv support to a new Unix library.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 5f44c46164a5c0c50fffdf6cda9980a74079e1ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f44c46164a5c0c50fffdf6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:28 2021 +0200 dnsapi: Move libresolv support to a new Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 1 + dlls/dnsapi/dnsapi.h | 19 +- dlls/dnsapi/libresolv.c | 742 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/main.c | 20 ++ dlls/dnsapi/name.c | 23 +- dlls/dnsapi/query.c | 582 +------------------------------------ dlls/dnsapi/record.c | 66 ++--- 7 files changed, 809 insertions(+), 644 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f44c46164a5c0c50fff…

1 0

Hans Leidekker : dnsapi: Get rid of the dns_ prefix on helpers.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: fadcd9563f2bba63f33ccbc89ce467b932281565 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fadcd9563f2bba63f33ccbc8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:27 2021 +0200 dnsapi: Get rid of the dns_ prefix on helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 47 +++++++++++------------- dlls/dnsapi/name.c | 8 ++-- dlls/dnsapi/query.c | 102 +++++++++++++++++++++++++-------------------------- dlls/dnsapi/record.c | 87 +++++++++++++++++++------------------------ 4 files changed, 114 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fadcd9563f2bba63f33c…

1 0

Paul Gofman : kernel32: Implement GetSystemCpuSetInformation().
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: f2ac82b866a76648e0ee4bb46c35f00f8583c5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2ac82b866a76648e0ee4bb4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 13:37:40 2021 +0300 kernel32: Implement GetSystemCpuSetInformation(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/process.c | 66 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 16 ++++++ include/winbase.h | 1 + 6 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 9cc853d2884..8f2daaefe74 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -1,6 +1,6 @@ @ stub GetProcessDefaultCpuSets @ stub GetProcessInformation -@ stub GetSystemCpuSetInformation +@ stdcall GetSystemCpuSetInformation(ptr long ptr ptr long) kernel32.GetSystemCpuSetInformation @ stdcall GetThreadDescription(long ptr) kernel32.GetThreadDescription @ stub GetThreadSelectedCpuSets @ stub SetProcessDefaultCpuSets diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d14bf010383..0312e044a86 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -822,6 +822,7 @@ @ stdcall GetStringTypeExA(long long str long ptr) @ stdcall -import GetStringTypeExW(long long wstr long ptr) @ stdcall -import GetStringTypeW(long wstr long ptr) +@ stdcall -import GetSystemCpuSetInformation(ptr long ptr ptr long) @ stdcall -import GetSystemFileCacheSize(ptr ptr ptr) @ stdcall -import GetSystemDefaultLCID() @ stdcall -import GetSystemDefaultLangID() diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 373212cd2da..433c12ff1fb 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -79,6 +79,7 @@ static BOOL (WINAPI *pSetInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS static HANDLE (WINAPI *pCreateIoCompletionPort)(HANDLE file, HANDLE existing_port, ULONG_PTR key, DWORD threads); static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI *pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); static BOOL (WINAPI *pProcess32First)(HANDLE, PROCESSENTRY32*); @@ -87,6 +88,7 @@ static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static SIZE_T (WINAPI *pGetLargePageMinimum)(void); +static BOOL (WINAPI *pGetSystemCpuSetInformation)(SYSTEM_CPU_SET_INFORMATION*,ULONG,ULONG*,HANDLE,ULONG); static BOOL (WINAPI *pInitializeProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD, SIZE_T*); static BOOL (WINAPI *pUpdateProcThreadAttribute)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD_PTR, void *,SIZE_T,void*,SIZE_T*); static void (WINAPI *pDeleteProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*); @@ -245,6 +247,7 @@ static BOOL init(void) hntdll = GetModuleHandleA("ntdll.dll"); pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); + pNtQuerySystemInformationEx = (void *)GetProcAddress(hntdll, "NtQuerySystemInformationEx"); pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); pGetSystemRegistryQuota = (void *) GetProcAddress(hkernel32, "GetSystemRegistryQuota"); @@ -269,6 +272,7 @@ static BOOL init(void) pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); pGetLargePageMinimum = (void *)GetProcAddress(hkernel32, "GetLargePageMinimum"); + pGetSystemCpuSetInformation = (void *)GetProcAddress(hkernel32, "GetSystemCpuSetInformation"); pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList"); pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute"); pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList"); @@ -3786,6 +3790,67 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_GetSystemCpuSetInformation(void) +{ + SYSTEM_CPU_SET_INFORMATION *info, *info_nt; + HANDLE process = GetCurrentProcess(); + ULONG size, expected_size; + NTSTATUS status; + SYSTEM_INFO si; + BOOL ret; + + if (!pGetSystemCpuSetInformation) + { + win_skip("GetSystemCpuSetInformation() is not supported.\n"); + return; + } + + GetSystemInfo(&si); + + expected_size = sizeof(*info) * si.dwNumberOfProcessors; + + if (0) + { + /* Crashes on Windows with NULL return length. */ + pGetSystemCpuSetInformation(NULL, 0, NULL, process, 0); + } + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pGetSystemCpuSetInformation(NULL, size, &size, process, 0); + ok(!ret && GetLastError() == ERROR_NOACCESS, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(!size, "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pGetSystemCpuSetInformation(NULL, 0, &size, (HANDLE)0xdeadbeef, 0); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(!size, "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pGetSystemCpuSetInformation(NULL, 0, &size, process, 0); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(size == expected_size, "Got unexpected size %u.\n", size); + + info = heap_alloc(size); + info_nt = heap_alloc(size); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info_nt, expected_size, NULL); + ok(!status, "Got unexpected status %#x.\n", status); + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pGetSystemCpuSetInformation(info, expected_size, &size, process, 0); + ok(ret && GetLastError() == 0xdeadbeef, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(size == expected_size, "Got unexpected size %u.\n", size); + + ok(!memcmp(info, info_nt, expected_size), "Info does not match NtQuerySystemInformationEx()."); + + heap_free(info_nt); + heap_free(info); +} + static void test_largepages(void) { SIZE_T size; @@ -4348,6 +4413,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_GetSystemCpuSetInformation(); test_largepages(); test_ProcThreadAttributeList(); test_SuspendProcessState(); diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 08a2f726817..8cb15fff084 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -681,7 +681,7 @@ @ stdcall GetStringTypeW(long wstr long ptr) # @ stub GetSystemAppDataFolder # @ stub GetSystemAppDataKey -# @ stub GetSystemCpuSetInformation +@ stdcall GetSystemCpuSetInformation(ptr long ptr ptr long) @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() @ stdcall GetSystemDefaultLocaleName(ptr long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 2bfd3893e8e..60333db242f 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1130,6 +1130,22 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetLogicalProcessorInformationEx( LOGICAL_PROCESSO } +/*********************************************************************** + * GetSystemCpuSetInformation (kernelbase.@) + */ +BOOL WINAPI GetSystemCpuSetInformation(SYSTEM_CPU_SET_INFORMATION *info, ULONG buffer_length, ULONG *return_length, + HANDLE process, ULONG flags) +{ + if (flags) + FIXME("Unsupported flags %#x.\n", flags); + + *return_length = 0; + + return set_ntstatus( NtQuerySystemInformationEx( SystemCpuSetInformation, &process, sizeof(process), info, + buffer_length, return_length )); +} + + /********************************************************************** * GetNumaHighestNodeNumber (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 651da6d6906..beb91371bb6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2274,6 +2274,7 @@ WINBASEAPI VOID WINAPI GetStartupInfoA(LPSTARTUPINFOA); WINBASEAPI VOID WINAPI GetStartupInfoW(LPSTARTUPINFOW); #define GetStartupInfo WINELIB_NAME_AW(GetStartupInfo) WINBASEAPI HANDLE WINAPI GetStdHandle(DWORD); +WINBASEAPI BOOL WINAPI GetSystemCpuSetInformation(SYSTEM_CPU_SET_INFORMATION*,ULONG,ULONG*,HANDLE,ULONG); WINBASEAPI UINT WINAPI GetSystemDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT); #define GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory)

1 0

Paul Gofman : ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation).
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 084519a82b7b78e0c2839f3fed8c6c75bd63d07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=084519a82b7b78e0c2839f3f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 13:37:39 2021 +0300 ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 84 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 41 ++++++++++++++++ include/winternl.h | 1 + 4 files changed, 246 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=084519a82b7b78e0c283…

1 0

Alexandre Julliard : include: Add more SYSTEM_INFORMATION_CLASS definitions.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: afaf35b9e1a14ea5aeec2221cc96cd5ccdebc716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afaf35b9e1a14ea5aeec2221… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 13:23:13 2021 +0200 include: Add more SYSTEM_INFORMATION_CLASS definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 10 +-- dlls/ntdll/tests/time.c | 2 +- dlls/ntdll/time.c | 2 +- dlls/ntdll/unix/system.c | 4 +- include/winternl.h | 198 +++++++++++++++++++++++++++++++++++++------- programs/taskmgr/perfdata.c | 2 +- 6 files changed, 179 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afaf35b9e1a14ea5aeec…

1 0

Nikolay Sivov : mfplat: Add Lock()/Unlock() for d3d11 buffers.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 0d383fe182d11576e2580f6e1f48c4bd6ce72a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d383fe182d11576e2580f6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 11:28:06 2021 +0300 mfplat: Add Lock()/Unlock() for d3d11 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 65 +++++++++++++++++++++++++++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 12 +-------- 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 77767c27d94..f428630ea01 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -914,16 +914,73 @@ static void dxgi_surface_buffer_unmap(struct buffer *buffer) static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **data, DWORD *max_length, DWORD *current_length) { - FIXME("%p, %p, %p, %p.\n", iface, data, max_length, current_length); + struct buffer *buffer = impl_from_IMFMediaBuffer(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p.\n", iface, data, max_length, current_length); + + if (!data) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + if (!buffer->_2d.linear_buffer && buffer->_2d.locks) + hr = MF_E_INVALIDREQUEST; + else if (!buffer->_2d.linear_buffer) + { + if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + { + hr = dxgi_surface_buffer_map(buffer); + if (SUCCEEDED(hr)) + { + MFCopyImage(buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, + buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.width, buffer->_2d.height); + } + } + } + + if (SUCCEEDED(hr)) + { + ++buffer->_2d.locks; + *data = buffer->_2d.linear_buffer; + if (max_length) + *max_length = buffer->_2d.plane_size; + if (current_length) + *current_length = buffer->_2d.plane_size; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) { - FIXME("%p.\n", iface); + struct buffer *buffer = impl_from_IMFMediaBuffer(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&buffer->cs); + + if (!buffer->_2d.linear_buffer) + hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + else if (!--buffer->_2d.locks) + { + MFCopyImage(buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, + buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); + dxgi_surface_buffer_unmap(buffer); + + heap_free(buffer->_2d.linear_buffer); + buffer->_2d.linear_buffer = NULL; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current_length) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1e84acd08fa..c21a57be27f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6479,31 +6479,24 @@ static void test_dxgi_surface_buffer(void) max_length = cur_length = 0; data = NULL; hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(max_length && max_length == cur_length, "Unexpected length %u.\n", max_length); -} if (data) *(DWORD *)data = ~0u; color = get_d3d11_texture_color(texture, 0, 0); ok(!color, "Unexpected texture color %#x.\n", color); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); color = get_d3d11_texture_color(texture, 0, 0); -todo_wine ok(color == ~0u, "Unexpected texture color %#x.\n", color); hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); + ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Lock2D()/Unlock2D() */ @@ -6526,7 +6519,6 @@ todo_wine ok(data2 == data && pitch2 == pitch, "Unexpected data/pitch.\n"); hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); -todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMF2DBuffer_Unlock2D(_2d_buffer); @@ -6906,11 +6898,9 @@ todo_wine IMFDXGIBuffer_Release(dxgi_buffer); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample);

1 0

Alexandre Julliard : ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: f55f0b8448b6810f583784235d809bdbb10b2d6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55f0b8448b6810f58378423… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 10:20:54 2021 +0200 ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 17 ----------------- dlls/ntdll/unix/loadorder.c | 2 +- dlls/ntdll/unix/unix_private.h | 13 ++++++++++++- dlls/ntdll/unixlib.h | 16 +--------------- 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7c4572e6b0e..4c76865019b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1374,21 +1374,6 @@ done: } -/*********************************************************************** - * load_builtin_dll - */ -static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) -{ - SIZE_T size; - NTSTATUS status; - - status = find_builtin_dll( nt_name, module, &size, image_info, current_machine, prefer_native ); - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - return status; -} - - /*********************************************************************** * load_builtin * @@ -1794,11 +1779,9 @@ static struct unix_funcs unix_funcs = ntdll_tan, virtual_release_address_space, load_so_dll, - load_builtin_dll, init_builtin_dll, init_unix_lib, unwind_builtin_dll, - get_load_order, __wine_dbg_get_channel_flags, __wine_dbg_strdup, __wine_dbg_output, diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 67a7473dc7f..49af8eb6adb 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -378,7 +378,7 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA * Return the loadorder of a module. * The system directory and '.dll' extension is stripped from the path. */ -enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) +enum loadorder get_load_order( const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; enum loadorder ret = LO_INVALID; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 05ba8202ee7..3987cc6c4d0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -400,7 +400,18 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) } #endif -extern enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; +enum loadorder +{ + LO_INVALID, + LO_DISABLED, + LO_NATIVE, + LO_BUILTIN, + LO_NATIVE_BUILTIN, /* native then builtin */ + LO_BUILTIN_NATIVE, /* builtin then native */ + LO_DEFAULT /* nothing specified, use default strategy */ +}; + +extern enum loadorder get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; static inline size_t ntdll_wcslen( const WCHAR *str ) { diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 80e4eaefc75..04ae8230b1a 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -25,19 +25,8 @@ struct _DISPATCHER_CONTEXT; -enum loadorder -{ - LO_INVALID, - LO_DISABLED, - LO_NATIVE, - LO_BUILTIN, - LO_NATIVE_BUILTIN, /* native then builtin */ - LO_BUILTIN_NATIVE, /* builtin then native */ - LO_DEFAULT /* nothing specified, use default strategy */ -}; - /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 119 +#define NTDLL_UNIXLIB_VERSION 120 struct unix_funcs { @@ -85,13 +74,10 @@ struct unix_funcs /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); - NTSTATUS (CDECL *load_builtin_dll)( UNICODE_STRING *name, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ); void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - enum loadorder (CDECL *get_load_order)( const UNICODE_STRING *nt_name ); /* debugging functions */ unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel );

1 0

Alexandre Julliard : ntdll: Make sure the argv array matches the Unicode version, even when launching start.exe.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 726cf9c0ebcd9abc5b8c3e29f44d1b7451606c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=726cf9c0ebcd9abc5b8c3e29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 09:56:32 2021 +0200 ntdll: Make sure the argv array matches the Unicode version, even when launching start.exe. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 198 +++++++++++++++++++++++++++++------------------ dlls/ntdll/unix/loader.c | 25 ++++-- 2 files changed, 140 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=726cf9c0ebcd9abc5b8c…

1 0