February 2019 - Wine-commits

Józef Kucia : wined3d: Do not convert SO declaration entries.
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: c74c8800b3e8b2f89a43c38b9d90de675abae0ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74c8800b3e8b2f89a43c38b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 18:26:19 2019 +0100 wined3d: Do not convert SO declaration entries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 92 +++++------------------------------------- dlls/wined3d/glsl_shader.c | 40 +++++++++--------- dlls/wined3d/shader.c | 57 +++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 6 +-- 5 files changed, 93 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c74c8800b3e8b2f89a43…

1 0

Alistair Leslie-Hughes : secur32: Fix compile error on older gnutls.
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: 9bbe5c361312034c708618f2e01d7272e4fae2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbe5c361312034c708618f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 8 11:07:50 2019 +0000 secur32: Fix compile error on older gnutls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ddb10ac..ea116e81 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -51,6 +51,13 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); +/* Not present in gnutls version < 3.3.0. */ +static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *); + /* Not present in gnutls version < 3.4.0. */ static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *); @@ -79,7 +86,6 @@ MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_privkey_deinit); -MAKE_FUNCPTR(gnutls_privkey_import_rsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); @@ -138,6 +144,16 @@ static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x5 return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnutls_datum_t *p1, + const gnutls_datum_t *p2, const gnutls_datum_t *p3, + const gnutls_datum_t *p4, const gnutls_datum_t *p5, + const gnutls_datum_t *p6, const gnutls_datum_t *p7, + const gnutls_datum_t *p8) +{ + FIXME("\n"); + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -897,7 +913,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_privkey_deinit) - LOAD_FUNCPTR(gnutls_privkey_import_rsa_raw) LOAD_FUNCPTR(gnutls_privkey_init) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); @@ -924,6 +939,11 @@ BOOL schan_imp_init(void) WARN("gnutls_privkey_export_x509 not found\n"); pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; } + if (!(pgnutls_privkey_import_rsa_raw = wine_dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw", NULL, 0))) + { + WARN("gnutls_privkey_import_rsa_raw not found\n"); + pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; + } ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS)

1 0

Zebediah Figura : ntdll: Reimplement condition variables on top of RtlWaitOnAddress().
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: 954ed39584ba30fe194558cfbafa84aa1d3b2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=954ed39584ba30fe194558cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 7 12:39:46 2019 -0600 ntdll: Reimplement condition variables on top of RtlWaitOnAddress(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46208 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8513561..693013f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1909,8 +1909,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -1920,9 +1920,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); - while (val-- > 0) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -1944,17 +1943,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + int val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) - { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); + return status; } @@ -1981,19 +1977,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + int val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) - { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock );

1 0

Alexandre Julliard : ntdll: Use an NT filename to search for loaded modules.
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: a6e4c814b6647c11483b2a6beca551d503d19bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e4c814b6647c11483b2a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 12:46:22 2019 +0100 ntdll: Use an NT filename to search for loaded modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1f92eb0..c1e336cd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -432,18 +432,23 @@ static WINE_MODREF *find_basename_module( LPCWSTR name ) * Find a module from its full path name. * The loader_section must be locked while calling this function */ -static WINE_MODREF *find_fullname_module( LPCWSTR name ) +static WINE_MODREF *find_fullname_module( const UNICODE_STRING *nt_name ) { PLIST_ENTRY mark, entry; + UNICODE_STRING name = *nt_name; - if (cached_modref && !strcmpiW( name, cached_modref->ldr.FullDllName.Buffer )) + if (name.Length <= 4 * sizeof(WCHAR)) return NULL; + name.Length -= 4 * sizeof(WCHAR); /* for \??\ prefix */ + name.Buffer += 4; + + if (cached_modref && RtlEqualUnicodeString( &name, &cached_modref->ldr.FullDllName, TRUE )) return cached_modref; mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) { LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); - if (!strcmpiW( name, mod->FullDllName.Buffer )) + if (RtlEqualUnicodeString( &name, &mod->FullDllName, TRUE )) { cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); return cached_modref; @@ -2351,6 +2356,8 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct HANDLE handle; int fd, needs_close; + if ((*pwm = find_fullname_module( nt_name ))) return 0; + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -2434,8 +2441,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (len) { if (len >= *size) goto overflow; - if ((*pwm = find_fullname_module( filename ))) goto found; - if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) { RtlFreeHeap( GetProcessHeap(), 0, dllname ); @@ -2462,8 +2467,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */ if (len >= *size) goto overflow; memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); - if (!(*pwm = find_fullname_module( filename ))) - *handle = open_dll_file( &nt_name, pwm, st ); + *handle = open_dll_file( &nt_name, pwm, st ); found: RtlFreeUnicodeString( &nt_name );

1 0

Alexandre Julliard : ntdll: Return an NT filename in find_dll_file().
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: 3099b04a89124964944d14ba30ee93b04278fe4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3099b04a89124964944d14ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 12:46:32 2019 +0100 ntdll: Return an NT filename in find_dll_file(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 146 ++++++++++++++++++++++++++-------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c1e336cd..0d8fc57 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2385,17 +2385,65 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct /*********************************************************************** + * search_dll_file + * + * Search for dll in the specified paths. + */ +static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name ) +{ + WCHAR *name; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + ULONG len = strlenW( paths ); + + if (len < strlenW( system_dir )) len = strlenW( system_dir ); + len += strlenW( search ) + 2; + + if (!(name = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + while (*paths) + { + LPCWSTR ptr = paths; + + while (*ptr && *ptr != ';') ptr++; + len = ptr - paths; + if (*ptr == ';') ptr++; + memcpy( name, paths, len * sizeof(WCHAR) ); + if (len && name[len - 1] != '\\') name[len++] = '\\'; + strcpyW( name + len, search ); + if (RtlDoesFileExists_U( name )) + { + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) + status = STATUS_NO_MEMORY; + else + status = STATUS_SUCCESS; + goto done; + } + paths = ptr; + } + + /* not found, return file in the system dir to be loaded as builtin */ + strcpyW( name, system_dir ); + strcatW( name, search ); + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; + +done: + RtlFreeHeap( GetProcessHeap(), 0, name ); + return status; +} + + +/*********************************************************************** * find_dll_file * * Find the file (or already loaded module) for a given dll name. */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, - WCHAR *filename, ULONG *size, WINE_MODREF **pwm, + UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDLE *handle, struct stat *st ) { - UNICODE_STRING nt_name; - WCHAR *file_part, *ext, *dllname; - ULONG len; + WCHAR *ext, *dllname; + NTSTATUS status; /* first append .dll if needed */ @@ -2411,11 +2459,10 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, libname = dllname; } - nt_name.Buffer = NULL; + nt_name->Buffer = NULL; if (!contains_path( libname )) { - NTSTATUS status; WCHAR *fullname = NULL; if ((*pwm = find_basename_module( libname )) != NULL) goto found; @@ -2437,48 +2484,30 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { /* we need to search for it */ - len = RtlDosSearchPath_U( load_path, libname, NULL, *size, filename, &file_part ); - if (len) + if (!(status = search_dll_file( load_path, libname, nt_name ))) { - if (len >= *size) goto overflow; - if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return STATUS_NO_MEMORY; - } - *handle = open_dll_file( &nt_name, pwm, st ); + *handle = open_dll_file( nt_name, pwm, st ); } - else /* not found, return the name as is, to be loaded as builtin */ + else if (status != STATUS_DLL_NOT_FOUND) { - len = strlenW(libname) * sizeof(WCHAR); - if (len >= *size) goto overflow; - strcpyW( filename, libname ); + RtlFreeHeap( GetProcessHeap(), 0, dllname ); + return status; } goto found; } /* absolute path name */ - if (!RtlDosPathNameToNtPathName_U( libname, &nt_name, &file_part, NULL )) + if (!RtlDosPathNameToNtPathName_U( libname, nt_name, NULL, NULL )) { RtlFreeHeap( GetProcessHeap(), 0, dllname ); return STATUS_NO_MEMORY; } - len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */ - if (len >= *size) goto overflow; - memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); - *handle = open_dll_file( &nt_name, pwm, st ); + *handle = open_dll_file( nt_name, pwm, st ); found: - RtlFreeUnicodeString( &nt_name ); RtlFreeHeap( GetProcessHeap(), 0, dllname ); return STATUS_SUCCESS; - -overflow: - RtlFreeUnicodeString( &nt_name ); - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - *size = len + sizeof(WCHAR); - return STATUS_BUFFER_TOO_SMALL; } @@ -2491,10 +2520,9 @@ overflow: static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) { enum loadorder loadorder; - WCHAR buffer[64]; WCHAR *filename; - ULONG size; WINE_MODREF *main_exe; + UNICODE_STRING nt_name; struct stat st; HANDLE handle; NTSTATUS nts; @@ -2502,17 +2530,8 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); *pwm = NULL; - filename = buffer; - size = sizeof(buffer); - for (;;) - { - nts = find_dll_file( load_path, libname, filename, &size, pwm, &handle, &st ); - if (nts == STATUS_SUCCESS) break; - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - if (nts != STATUS_BUFFER_TOO_SMALL) return nts; - /* grow the buffer and retry */ - if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; - } + nts = find_dll_file( load_path, libname, &nt_name, pwm, &handle, &st ); + if (nts) return nts; if (*pwm) /* found already loaded module */ { @@ -2521,10 +2540,11 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE("Found %s for %s at %p, count=%d\n", debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(libname), (*pwm)->ldr.BaseAddress, (*pwm)->ldr.LoadCount); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + RtlFreeUnicodeString( &nt_name ); return STATUS_SUCCESS; } + filename = nt_name.Buffer + 4; /* \??\ prefix */ main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); @@ -2578,19 +2598,13 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } if (nts == STATUS_SUCCESS) - { - /* Initialize DLL just loaded */ TRACE("Loaded module %s (%s) at %p\n", debugstr_w(filename), - ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", - (*pwm)->ldr.BaseAddress); - if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - return nts; - } + ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", (*pwm)->ldr.BaseAddress); + else + WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); - WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + RtlFreeUnicodeString( &nt_name ); return nts; } @@ -2630,9 +2644,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) { NTSTATUS status; - WCHAR buffer[128]; - WCHAR *filename; - ULONG size; + UNICODE_STRING nt_name; WINE_MODREF *wm; HANDLE handle; struct stat st; @@ -2641,21 +2653,9 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - filename = buffer; - size = sizeof(buffer); - for (;;) - { - status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, &handle, &st ); - if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - if (status != STATUS_BUFFER_TOO_SMALL) break; - /* grow the buffer and retry */ - if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) - { - status = STATUS_NO_MEMORY; - break; - } - } + status = find_dll_file( load_path, name->Buffer, &nt_name, &wm, &handle, &st ); + if (handle) NtClose( handle ); + RtlFreeUnicodeString( &nt_name ); if (status == STATUS_SUCCESS) {

1 0

Alexandre Julliard : ntdll: Pass an NT filename to get_load_order().
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: e24b16247d156542b209ae1d08e2c366eee3071a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24b16247d156542b209ae1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 22:07:54 2019 +0100 ntdll: Pass an NT filename to get_load_order(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/loadorder.c | 5 ++++- dlls/ntdll/ntdll_misc.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0d8fc57..7e26098 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2546,7 +2546,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ filename = nt_name.Buffer + 4; /* \??\ prefix */ main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); - loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); + loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, &nt_name ); if (handle && is_fake_dll( handle )) { diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index c6c0245..b965b96 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -429,16 +429,19 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, cons * Return the loadorder of a module. * The system directory and '.dll' extension is stripped from the path. */ -enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) +enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) { + static const WCHAR nt_prefixW[] = {'\\','?','?','\\',0}; enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; + const WCHAR *path = nt_name->Buffer; WCHAR *module, *basename; int len; if (!init_done) init_load_order(); std_key = get_standard_key(); if (app_name) app_key = get_app_key( app_name ); + if (!strncmpW( path, nt_prefixW, 4 )) path += 4; TRACE("looking for %s\n", debugstr_w(path)); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1630978..5b32abc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -216,7 +216,7 @@ enum loadorder LO_DEFAULT /* nothing specified, use default strategy */ }; -extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; +extern enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; struct debug_info {

1 0

Alexandre Julliard : ntdll: Use NT filenames when loading dlls.
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: dc40bc85bc01b24951edb128eee11a9b740652fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc40bc85bc01b24951edb128… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 12:49:47 2019 +0100 ntdll: Use NT filenames when loading dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 108 +++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc40bc85bc01b24951ed…

1 0

Alexandre Julliard : ntdll: Remove no longer used parameter from find_fileid_module().
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: f7b3120991df02ecaa975c18c6421fedb48ae731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7b3120991df02ecaa975c18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 23:00:27 2019 +0100 ntdll: Remove no longer used parameter from find_fileid_module(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f017651..e7a9c2c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -464,7 +464,7 @@ static WINE_MODREF *find_fullname_module( const UNICODE_STRING *nt_name ) * Find a module from its file id. * The loader_section must be locked while calling this function */ -static WINE_MODREF *find_fileid_module( HANDLE handle, struct stat *st ) +static WINE_MODREF *find_fileid_module( struct stat *st ) { LIST_ENTRY *mark, *entry; @@ -2368,7 +2368,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct { fstat( fd, st ); if (needs_close) close( fd ); - if ((*pwm = find_fileid_module( handle, st ))) + if ((*pwm = find_fileid_module( st ))) { TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer ));

1 0

Henri Verbeet : d3d8: Improve ValidateVertexShader().
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: 3ccbb762d2982ca3cf3117b3cc4dd0cd92855593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ccbb762d2982ca3cf3117b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 8 02:27:37 2019 +0330 d3d8: Improve ValidateVertexShader(). Based largely on a patch by Sebastian Lackner. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_main.c | 64 +++++++++++++++++------------- dlls/d3d8/tests/device.c | 100 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 113 insertions(+), 51 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 5fbd165..17f35c9 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -57,40 +57,50 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) return &object->IDirect3D8_iface; } -/*********************************************************************** - * ValidateVertexShader (D3D8.@) - * - * I've seen reserved1 and reserved2 always passed as 0's - * boolean seems always passed as 0 or 1, but other values work as well... - * toto result? - */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto) +/* FIXME: We should probably use libvkd3d-shader for validation. */ +HRESULT WINAPI ValidateVertexShader(const DWORD *vs_code, const DWORD *declaration, + const D3DCAPS8 *caps, BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto); - warned = TRUE; - } - - if (!vertexshader) - return E_FAIL; + TRACE("vs_code %p, declaration %p, caps %p, return_error %#x, errors %p.\n", + vs_code, declaration, caps, return_error, errors); - if (reserved1 || reserved2) - return E_FAIL; + if (!vs_code) + { + message = "Invalid code pointer.\n"; + goto done; + } - switch(*vertexshader) { - case 0xFFFE0101: - case 0xFFFE0100: - ret=S_OK; + switch (*vs_code) + { + case D3DVS_VERSION(1, 1): + case D3DVS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *vertexshader); - ret=E_FAIL; - } + message = "Unsupported shader version.\n"; + goto done; + } - return ret; + if (caps && *vs_code > caps->VertexShaderVersion) + { + message = "Shader version not supported by caps.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } /*********************************************************************** diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b57be7a..315640d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -27,6 +27,7 @@ #include <initguid.h> #include <d3d8.h> #include "wine/test.h" +#include "wine/heap.h" struct vec3 { @@ -51,7 +52,7 @@ struct device_desc static DEVMODEW registry_mode; -static HRESULT (WINAPI *ValidateVertexShader)(DWORD *, DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4365,7 +4366,7 @@ static void test_set_rt_vp_scissor(void) static void test_validate_vs(void) { - static DWORD vs[] = + static DWORD vs_code[] = { 0xfffe0101, /* vs_1_1 */ 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ @@ -4374,40 +4375,91 @@ static void test_validate_vs(void) 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ 0x0000ffff, /* end */ }; + D3DCAPS8 caps; + char *errors; HRESULT hr; - hr = ValidateVertexShader(0, 0, 0, 0, 0); + static DWORD declaration_valid1[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT4), + D3DVSD_END() + }; + static DWORD declaration_valid2[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT2), + D3DVSD_END() + }; + static DWORD declaration_invalid[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_NORMAL, D3DVSDT_FLOAT4), + D3DVSD_END() + }; + + hr = ValidateVertexShader(NULL, NULL, NULL, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidateVertexShader(0, 0, 0, 1, 0); + hr = ValidateVertexShader(NULL, NULL, NULL, TRUE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidateVertexShader(vs, 0, 0, 0, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(NULL, NULL, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidateVertexShader(NULL, NULL, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); - hr = ValidateVertexShader(vs, 0, 0, 1, 0); + hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *vs = 0xfffe0100; /* vs_1_0 */ - hr = ValidateVertexShader(vs, 0, 0, 0, 0); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - *vs = 0xfffe0102; /* bogus version */ - hr = ValidateVertexShader(vs, 0, 0, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd and 3rd parameter as 0. - * Simple test with non-zero parameters. */ - *vs = 0xfffe0101; /* vs_1_1 */ - hr = ValidateVertexShader(vs, vs, 0, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, declaration_valid1, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, declaration_valid2, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, declaration_invalid, NULL, FALSE, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidateVertexShader(vs, 0, vs, 1, 0); + memset(&caps, 0, sizeof(caps)); + caps.VertexShaderVersion = D3DVS_VERSION(1, 1); + caps.MaxVertexShaderConst = 4; + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.VertexShaderVersion = D3DVS_VERSION(1, 0); + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 4th parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidateVertexShader(vs, 0, 0, 12345, 0); + caps.VertexShaderVersion = D3DVS_VERSION(1, 2); + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 5th parameter? The following seems to work ok. */ - hr = ValidateVertexShader(vs, 0, 0, 1, vs); + caps.VertexShaderVersion = D3DVS_VERSION(8, 8); + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.VertexShaderVersion = D3DVS_VERSION(1, 1); + caps.MaxVertexShaderConst = 3; + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + *vs_code = D3DVS_VERSION(1, 0); + hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + *vs_code = D3DVS_VERSION(1, 2); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_validate_ps(void)

1 0

Paul Gofman : ddraw/tests: Port test_alphatest() from d3d9.
by Alexandre Julliard 08 Feb '19

08 Feb '19

Module: wine Branch: master Commit: fda88f78d1480c9d5b86e568d73d18e911c246d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fda88f78d1480c9d5b86e568… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 8 02:27:38 2019 +0330 ddraw/tests: Port test_alphatest() from d3d9. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 127 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 118 ++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 111 ++++++++++++++++++++++++++++++ 4 files changed, 526 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fda88f78d1480c9d5b86…

1 0