wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

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

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: 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: 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: 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

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

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

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 : ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface.
by Alexandre Julliard 30 Mar '21

30 Mar '21

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: Map the builtin or fake dll from the Wine dirs if it's missing from the prefix.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: bb065801a693e1cd305d2a507c206f1b21a142d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb065801a693e1cd305d2a50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 10:12:07 2021 +0200 ntdll: Map the builtin or fake dll from the Wine dirs if it's missing from the prefix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 4 +- dlls/mscoree/tests/mscoree.c | 4 +- dlls/ntdll/loader.c | 141 ++++++++++++++++++++++++++----------------- 3 files changed, 88 insertions(+), 61 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 6eb2fc804d1..46f5c43b54e 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -422,10 +422,8 @@ static void testLoadLibraryEx(void) /* load kernel32.dll with an absolute path that does not exist */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA(path, NULL, LOAD_LIBRARY_AS_DATAFILE); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); todo_wine - { - ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - } ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 9974eff6335..92126339ef0 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -368,7 +368,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusion, vbogus, NULL, &hdll); - todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); @@ -406,7 +406,7 @@ static void test_loadlibraryshim(void) FreeLibrary(hdll); hr = pLoadLibraryShim(gdidll, latest, NULL, &hdll); - todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7dada146044..e8b53778284 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2378,38 +2378,6 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, } -/*********************************************************************** - * load_builtin_dll - */ -static NTSTATUS load_builtin_dll( LPCWSTR load_path, UNICODE_STRING *nt_name, - DWORD flags, WINE_MODREF** pwm, BOOL prefer_native ) -{ - NTSTATUS status; - void *module; - SECTION_IMAGE_INFORMATION image_info; - - TRACE("Trying built-in %s\n", debugstr_us(nt_name)); - - status = unix_funcs->load_builtin_dll( nt_name, &module, &image_info, prefer_native ); - if (status) return status; - - if ((*pwm = find_existing_module( module ))) /* already loaded */ - { - if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; - TRACE( "Found %s for %s at %p, count=%d\n", - debugstr_us(&(*pwm)->ldr.FullDllName), debugstr_us(nt_name), - (*pwm)->ldr.DllBase, (*pwm)->ldr.LoadCount); - if (module != (*pwm)->ldr.DllBase) NtUnmapViewOfSection( NtCurrentProcess(), module ); - return STATUS_SUCCESS; - } - - TRACE( "loading %s\n", debugstr_us(nt_name) ); - status = build_module( load_path, nt_name, &module, &image_info, NULL, flags, pwm ); - if (status && module) NtUnmapViewOfSection( NtCurrentProcess(), module ); - return status; -} - - /************************************************************************* * build_main_module * @@ -2553,6 +2521,86 @@ done: } +/*********************************************************************** + * get_env_var + */ +static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *ret ) +{ + NTSTATUS status; + SIZE_T len, size = 1024 + extra; + + for (;;) + { + ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ); + status = RtlQueryEnvironmentVariable( NULL, name, wcslen(name), + ret->Buffer, size - extra - 1, &len ); + if (!status) + { + ret->Buffer[len] = 0; + ret->Length = len * sizeof(WCHAR); + ret->MaximumLength = size * sizeof(WCHAR); + return status; + } + RtlFreeHeap( GetProcessHeap(), 0, ret->Buffer ); + if (status != STATUS_BUFFER_TOO_SMALL) return status; + size = len + 1 + extra; + } +} + + +/*********************************************************************** + * find_builtin_without_file + * + * Find a builtin dll when the corresponding file cannot be found in the prefix. + * This is used during prefix bootstrap. + */ +static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *new_name, + WINE_MODREF **pwm, HANDLE *mapping, + SECTION_IMAGE_INFORMATION *image_info, struct file_id *id ) +{ + const WCHAR *ext; + WCHAR dllpath[32]; + DWORD i, len; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + BOOL found_image = FALSE; + + if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) + { + RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); + RtlAppendUnicodeToString( new_name, name ); + if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) return status; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) return status; + RtlFreeUnicodeString( new_name ); + } + for (i = 0; ; i++) + { + swprintf( dllpath, ARRAY_SIZE(dllpath), L"WINEDLLDIR%u", i ); + if (get_env_var( dllpath, 20 + wcslen(name), new_name )) break; + len = new_name->Length; + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; + else if (status != STATUS_DLL_NOT_FOUND) return status; + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\fakedlls\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; + else if (status != STATUS_DLL_NOT_FOUND) return status; + RtlFreeUnicodeString( new_name ); + } + if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + return status; +} + + /*********************************************************************** * search_dll_file * @@ -2597,14 +2645,10 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * paths = ptr; } - if (!found_image) - { - /* not found, return file in the system dir to be loaded as builtin */ - wcscpy( name, system_dir ); - wcscat( name, search ); - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; - } - else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + if (found_image) + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + else if (!wcspbrk( search, L":/\\" )) + status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); done: RtlFreeHeap( GetProcessHeap(), 0, name ); @@ -2713,7 +2757,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC return STATUS_SUCCESS; } - if (nts && nts != STATUS_DLL_NOT_FOUND && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; + if (nts && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; @@ -2727,21 +2771,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC case STATUS_SUCCESS: /* valid PE file */ nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); break; - - case STATUS_DLL_NOT_FOUND: /* no file found, try builtin */ - switch (unix_funcs->get_load_order( &nt_name )) - { - case LO_NATIVE_BUILTIN: - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - nts = load_builtin_dll( load_path, &nt_name, flags, pwm, FALSE ); - break; - default: - nts = STATUS_DLL_NOT_FOUND; - break; - } - break; } NtCurrentTeb()->Tib.ArbitraryUserPointer = prev;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
117
Older →

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 March 2021