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

Alexandre Julliard : ntdll: Set the window title to the image name on the Unix side.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: c5b0dd5fc22f7819f0921e173da8734e8e58bac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b0dd5fc22f7819f0921e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 12:25:42 2021 +0200 ntdll: Set the window title to the image name on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a7b025d79d2..2101f463287 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1941,7 +1941,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) size = (sizeof(*params) + MAX_PATH * sizeof(WCHAR) /* curdir */ + (wcslen( cmdline ) + 1) * sizeof(WCHAR) /* command line */ - + (wcslen( main_wargv[0] ) + 1) * sizeof(WCHAR) /* image path */ + + (wcslen( main_wargv[0] ) + 1) * sizeof(WCHAR) * 2 /* image path + window title */ + env_pos * sizeof(WCHAR)); status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&params, 0, &size, @@ -1961,6 +1961,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) put_unicode_string( main_wargv[0], &dst, &params->ImagePathName ); put_unicode_string( cmdline, &dst, &params->CommandLine ); + put_unicode_string( main_wargv[0], &dst, &params->WindowTitle ); free( image ); free( cmdline ); free( curdir );

1 0

Alexandre Julliard : kernelbase: Don't fall back to dll loading for LOAD_LIBRARY_AS_DATAFILE.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: f404e309df185e4e0952f0b82d9d3533248cf9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f404e309df185e4e0952f0b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 12:26:22 2021 +0200 kernelbase: Don't fall back to dll loading for LOAD_LIBRARY_AS_DATAFILE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 7 +------ dlls/kernelbase/loader.c | 32 ++++++++++++-------------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 46f5c43b54e..96577989431 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -377,11 +377,7 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_FILE_INVALID, - "Expected ERROR_FILE_INVALID, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_INVALID, "Expected ERROR_FILE_INVALID, got %d\n", GetLastError()); DeleteFileA("testfile.dll"); @@ -423,7 +419,6 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA(path, NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..bdc153b1a47 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -95,6 +95,7 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na file = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 ); } + if (file == INVALID_HANDLE_VALUE) ERR("can't load %s\n", debugstr_w(name)); if (file == INVALID_HANDLE_VALUE) return FALSE; mapping = CreateFileMappingW( file, NULL, protect, 0, 0, NULL ); @@ -154,31 +155,22 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrGetDllHandle( load_path, flags, libname, &module )) - { LdrAddRefDll( 0, module ); - LdrUnlockLoaderLock( 0, magic ); - goto done; - } - if (load_library_as_datafile( load_path, flags, libname->Buffer, &module )) - { - LdrUnlockLoaderLock( 0, magic ); - goto done; - } + else + load_library_as_datafile( load_path, flags, libname->Buffer, &module ); LdrUnlockLoaderLock( 0, magic ); - flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */ - /* Fallback to normal behaviour */ } - - status = LdrLoadDll( load_path, flags, libname, &module ); - if (status != STATUS_SUCCESS) + else { - module = 0; - if (status == STATUS_DLL_NOT_FOUND && (GetVersion() & 0x80000000)) - SetLastError( ERROR_DLL_NOT_FOUND ); - else - SetLastError( RtlNtStatusToDosError( status ) ); + status = LdrLoadDll( load_path, flags, libname, &module ); + if (!set_ntstatus( status )) + { + module = 0; + if (status == STATUS_DLL_NOT_FOUND && (GetVersion() & 0x80000000)) + SetLastError( ERROR_DLL_NOT_FOUND ); + } } -done: + RtlReleasePath( load_path ); return module; }

1 0

Nikolay Sivov : mfplat: Add Lock()/Unlock() for d3d11 buffers.
by Alexandre Julliard 30 Mar '21

30 Mar '21

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

Hans Leidekker : dnsapi: Get rid of imported domain name parsing code.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 0d26dd2afbc3255a6871f636257f7be3d962aba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d26dd2afbc3255a6871f636… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:26 2021 +0200 dnsapi: Get rid of imported domain name parsing code. These functions have been exported since glibc 2.9. 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/dnsapi.h | 7 -- dlls/dnsapi/ns_name.c | 313 ------------------------------------------------ dlls/dnsapi/ns_parse.c | 210 -------------------------------- dlls/dnsapi/query.c | 14 +-- 5 files changed, 7 insertions(+), 539 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d26dd2afbc3255a6871…

1 0

Hans Leidekker : dnsapi: Get rid of the dns_ prefix on helpers.
by Alexandre Julliard 30 Mar '21

30 Mar '21

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

Hans Leidekker : dnsapi: Move libresolv support to a new Unix library.
by Alexandre Julliard 30 Mar '21

30 Mar '21

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: Build with msvcrt.
by Alexandre Julliard 30 Mar '21

30 Mar '21

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/tests: Add a query test.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 7ff591d7dee84be729c037e88a25cc307ad38cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ff591d7dee84be729c037e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:30 2021 +0200 dnsapi/tests: Add a query test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 237dfd6ae7c..74669005a33 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -38,6 +38,11 @@ static void test_DnsQuery(void) DNS_RECORDW *rec; DNS_STATUS status; + rec = NULL; + status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + DnsRecordListFree(rec, DnsFreeRecordList); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status);

1 0

Paul Gofman : ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation).
by Alexandre Julliard 30 Mar '21

30 Mar '21

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

Paul Gofman : kernel32: Implement GetSystemCpuSetInformation().
by Alexandre Julliard 30 Mar '21

30 Mar '21

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