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

Damjan Jovanovic : shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: a3295e383116f1644cad88519c05e6c2ac7f3200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3295e383116f1644cad8851… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:31:06 2021 +0200 shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 66 +++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 51776f050ae..8e92a0896b5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4479,46 +4479,38 @@ static void test_CreateViewObject_contextmenu(void) LPITEMIDLIST pidl; HRESULT hr; DWORD ret; + int i; - hr = CoCreateInstance(&CLSID_ControlPanel, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); - - hr = CoCreateInstance(&CLSID_MyComputer, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); - - hr = CoCreateInstance(&CLSID_NetworkPlaces, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + static const CLSID *folders[] = + { + &CLSID_MyComputer, + &CLSID_MyDocuments, + &CLSID_ControlPanel, + &CLSID_NetworkPlaces, + &CLSID_Printers, + &CLSID_RecycleBin + }; - hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + for (i = 0; i < ARRAY_SIZE(folders); i++) + { + hr = CoCreateInstance(folders[i], NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + if (hr != S_OK) + { + win_skip("Failed to create folder %s, hr %#x.\n", wine_dbgstr_guid(folders[i]), hr); + continue; + } - hr = CoCreateInstance(&CLSID_RecycleBin, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + if (IsEqualIID(folders[i], &CLSID_MyDocuments)) + ok(hr == S_OK, "got 0x%08x\n", hr); + else if (IsEqualIID(folders[i], &CLSID_MyComputer)) + ok(hr == S_OK || broken(hr == E_NOINTERFACE /* win10 */), "got 0x%08x\n", hr); + else + ok(hr == E_NOINTERFACE || broken(FAILED(hr)), "got 0x%08x for %s\n", hr, wine_dbgstr_guid(folders[i])); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + } hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Zebediah Figura : ws2_32: Map EWOULDBLOCK to STATUS_DEVICE_NOT_READY.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 08da4ba92767c7aa1b5da250b5ab17602fd9ea35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08da4ba92767c7aa1b5da250… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 21:42:30 2021 -0500 ws2_32: Map EWOULDBLOCK to STATUS_DEVICE_NOT_READY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5dc725c4a58..1d1490b2c72 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -816,7 +816,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; - case EWOULDBLOCK: return STATUS_CANT_WAIT; + case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; @@ -943,7 +943,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEFAULT: return STATUS_NO_MEMORY; case WSAEINVAL: return STATUS_INVALID_PARAMETER; case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; - case WSAEWOULDBLOCK: return STATUS_CANT_WAIT; + case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; case WSAEINPROGRESS: return STATUS_PENDING; case WSAEALREADY: return STATUS_NETWORK_BUSY; case WSAENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; @@ -995,7 +995,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_NO_MEMORY: return WSAEFAULT; case STATUS_ACCESS_DENIED: return WSAEACCES; case STATUS_TOO_MANY_OPENED_FILES: return WSAEMFILE; - case STATUS_CANT_WAIT: return WSAEWOULDBLOCK; + case STATUS_DEVICE_NOT_READY: return WSAEWOULDBLOCK; case STATUS_BUFFER_OVERFLOW: return WSAEMSGSIZE; case STATUS_NOT_SUPPORTED: return WSAEOPNOTSUPP; case STATUS_HOST_UNREACHABLE: return WSAEHOSTUNREACH;

1 0

Zebediah Figura : server: Return a proper NTSTATUS from IOCTL_AFD_ACCEPT.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: a0cc3415596002c6ccdf761f396e0564876e9897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0cc3415596002c6ccdf761f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 21:42:31 2021 -0500 server: Return a proper NTSTATUS from IOCTL_AFD_ACCEPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 14 +++++++------- server/trace.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/sock.c b/server/sock.c index 39f02036da8..05fb737283b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -462,7 +462,7 @@ static void fill_accept_output( struct accept_req *req ) return; } - set_win32_error( sock_get_error( errno ) ); + set_error( sock_get_ntstatus( errno ) ); free( out_data ); return; } @@ -481,7 +481,7 @@ static void fill_accept_output( struct accept_req *req ) if (getsockname( fd, &unix_addr.addr, &unix_len ) < 0 || (win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len - sizeof(int) )) < 0) { - set_win32_error( sock_get_error( errno ) ); + set_error( sock_get_ntstatus( errno ) ); free( out_data ); return; } @@ -494,7 +494,7 @@ static void fill_accept_output( struct accept_req *req ) if (getpeername( fd, &unix_addr.addr, &unix_len ) < 0 || (win_len = sockaddr_from_unix( &unix_addr, win_addr, remote_len - sizeof(int) )) < 0) { - set_win32_error( sock_get_error( errno ) ); + set_error( sock_get_ntstatus( errno ) ); free( out_data ); return; } @@ -1105,7 +1105,7 @@ static int accept_new_fd( struct sock *sock ) if (acceptfd != -1) fcntl( acceptfd, F_SETFL, O_NONBLOCK ); else - set_win32_error( sock_get_error( errno )); + set_error( sock_get_ntstatus( errno )); return acceptfd; } @@ -1290,7 +1290,7 @@ static int sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; - case EWOULDBLOCK: return STATUS_CANT_WAIT; + case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; @@ -1387,7 +1387,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) struct accept_req *req; if (sock->state & FD_WINE_NONBLOCKING) return 0; - if (get_error() != (0xc0010000 | WSAEWOULDBLOCK)) return 0; + if (get_error() != STATUS_DEVICE_NOT_READY) return 0; if (!(req = alloc_accept_req( sock, NULL, async, NULL ))) return 0; list_add_tail( &sock->accept_list, &req->entry ); @@ -1435,7 +1435,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (acceptsock->accept_recv_req) { release_object( acceptsock ); - set_win32_error( WSAEINVAL ); + set_error( STATUS_INVALID_PARAMETER ); return 0; } diff --git a/server/trace.c b/server/trace.c index 5dfb40bb2ac..394effabf0e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5299,7 +5299,6 @@ static const struct { "CANCELLED", STATUS_CANCELLED }, { "CANNOT_DELETE", STATUS_CANNOT_DELETE }, { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, - { "CANT_WAIT", STATUS_CANT_WAIT }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, { "CONNECTION_ABORTED", STATUS_CONNECTION_ABORTED }, { "CONNECTION_DISCONNECTED", STATUS_CONNECTION_DISCONNECTED }, @@ -5307,6 +5306,7 @@ static const struct { "CONNECTION_RESET", STATUS_CONNECTION_RESET }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, { "DEVICE_BUSY", STATUS_DEVICE_BUSY }, + { "DEVICE_NOT_READY", STATUS_DEVICE_NOT_READY }, { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, { "DISK_FULL", STATUS_DISK_FULL }, { "DLL_NOT_FOUND", STATUS_DLL_NOT_FOUND },

1 0

Zebediah Figura : server: Return a proper NTSTATUS from IOCTL_AFD_ADDRESS_LIST_CHANGE.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 4f4dc095f6da63ec339a080679d518a0fbf499ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4dc095f6da63ec339a0806… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 21:42:32 2021 -0500 server: Return a proper NTSTATUS from IOCTL_AFD_ADDRESS_LIST_CHANGE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 05fb737283b..f51bb19a064 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1459,7 +1459,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { - set_win32_error( WSAEWOULDBLOCK ); + set_error( STATUS_DEVICE_NOT_READY ); return 0; } if (!sock_get_ifchange( sock )) return 0; @@ -1630,7 +1630,7 @@ static void ifchange_poll_event( struct fd *fd, int event ) unix_fd = socket( PF_NETLINK, SOCK_RAW, NETLINK_ROUTE ); if (unix_fd == -1) { - set_win32_error( sock_get_error( errno )); + set_error( sock_get_ntstatus( errno )); return NULL; } fcntl( unix_fd, F_SETFL, O_NONBLOCK ); /* make socket nonblocking */ @@ -1641,7 +1641,7 @@ static void ifchange_poll_event( struct fd *fd, int event ) if (bind( unix_fd, (struct sockaddr *)&addr, sizeof(addr) ) == -1) { close( unix_fd ); - set_win32_error( sock_get_error( errno )); + set_error( sock_get_ntstatus( errno )); return NULL; } if (!(ifchange = alloc_object( &ifchange_ops )))

1 0

Zebediah Figura : ws2_32: Map EADDRINUSE to STATUS_SHARING_VIOLATION.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 7a934b708c12fa0013424212b0c5b6d2a3c99be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a934b708c12fa0013424212… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 21:42:33 2021 -0500 ws2_32: Map EADDRINUSE to STATUS_SHARING_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1d1490b2c72..bfc3bea8ea3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -829,7 +829,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EPROTOTYPE: return STATUS_NOT_SUPPORTED; case ENOPROTOOPT: return STATUS_INVALID_PARAMETER; case EOPNOTSUPP: return STATUS_NOT_SUPPORTED; - case EADDRINUSE: return STATUS_ADDRESS_ALREADY_ASSOCIATED; + case EADDRINUSE: return STATUS_SHARING_VIOLATION; case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; @@ -956,7 +956,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEPROTOTYPE: return STATUS_NOT_SUPPORTED; case WSAENOPROTOOPT: return STATUS_INVALID_PARAMETER; case WSAEOPNOTSUPP: return STATUS_NOT_SUPPORTED; - case WSAEADDRINUSE: return STATUS_ADDRESS_ALREADY_ASSOCIATED; + case WSAEADDRINUSE: return STATUS_SHARING_VIOLATION; case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; @@ -989,7 +989,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_CONNECTION_RESET: return WSAECONNRESET; case STATUS_CONNECTION_ABORTED: return WSAECONNABORTED; case STATUS_CANCELLED: return WSA_OPERATION_ABORTED; - case STATUS_ADDRESS_ALREADY_ASSOCIATED: return WSAEADDRINUSE; + case STATUS_SHARING_VIOLATION: return WSAEADDRINUSE; case STATUS_IO_TIMEOUT: case STATUS_TIMEOUT: return WSAETIMEDOUT; case STATUS_NO_MEMORY: return WSAEFAULT;

1 0

Zebediah Figura : server: Map EADDRINUSE to STATUS_SHARING_VIOLATION.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 12f3e27bbb84a23ee9cbff404341e78bfe4d8a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f3e27bbb84a23ee9cbff40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 21:42:34 2021 -0500 server: Map EADDRINUSE to STATUS_SHARING_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- server/trace.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index f51bb19a064..49a75c33d2a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1303,7 +1303,7 @@ static int sock_get_ntstatus( int err ) case EPROTOTYPE: return STATUS_NOT_SUPPORTED; case ENOPROTOOPT: return STATUS_INVALID_PARAMETER; case EOPNOTSUPP: return STATUS_NOT_SUPPORTED; - case EADDRINUSE: return STATUS_ADDRESS_ALREADY_ASSOCIATED; + case EADDRINUSE: return STATUS_SHARING_VIOLATION; case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; diff --git a/server/trace.c b/server/trace.c index 394effabf0e..645c183a52f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5290,7 +5290,6 @@ static const struct { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, - { "ADDRESS_ALREADY_ASSOCIATED", STATUS_ADDRESS_ALREADY_ASSOCIATED }, { "ALERTED", STATUS_ALERTED }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BAD_IMPERSONATION_LEVEL", STATUS_BAD_IMPERSONATION_LEVEL },

1 0

Alexandre Julliard : ntdll: Implement RtlFindExportedRoutineByName().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 87b7132b37b733015a4a7db18571451f50683a32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87b7132b37b733015a4a7db1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 10:37:04 2021 +0200 ntdll: Implement RtlFindExportedRoutineByName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 74 ++++++++++++++++++++++++++++++++-------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/virtual.c | 12 ++++++++ include/winternl.h | 1 + 4 files changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index ee453700e51..c2dca4efc8e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -723,6 +723,29 @@ static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY } +/************************************************************************* + * find_name_in_exports + * + * Helper for find_named_export. + */ +static int find_name_in_exports( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, const char *name ) +{ + const WORD *ordinals = get_rva( module, exports->AddressOfNameOrdinals ); + const DWORD *names = get_rva( module, exports->AddressOfNames ); + int min = 0, max = exports->NumberOfNames - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + char *ename = get_rva( module, names[pos] ); + if (!(res = strcmp( ename, name ))) return ordinals[pos]; + if (res > 0) max = pos - 1; + else min = pos + 1; + } + return -1; +} + + /************************************************************************* * find_named_export * @@ -734,10 +757,10 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * { const WORD *ordinals = get_rva( module, exports->AddressOfNameOrdinals ); const DWORD *names = get_rva( module, exports->AddressOfNames ); - int min = 0, max = exports->NumberOfNames - 1; + int ordinal; /* first check the hint */ - if (hint >= 0 && hint <= max) + if (hint >= 0 && hint < exports->NumberOfNames) { char *ename = get_rva( module, names[hint] ); if (!strcmp( ename, name )) @@ -745,17 +768,30 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * } /* then do a binary search */ - while (min <= max) - { - int res, pos = (min + max) / 2; - char *ename = get_rva( module, names[pos] ); - if (!(res = strcmp( ename, name ))) - return find_ordinal_export( module, exports, exp_size, ordinals[pos], load_path ); - if (res > 0) max = pos - 1; - else min = pos + 1; - } - return NULL; + if ((ordinal = find_name_in_exports( module, exports, name )) == -1) return NULL; + return find_ordinal_export( module, exports, exp_size, ordinal, load_path ); + +} + + +/************************************************************************* + * RtlFindExportedRoutineByName + */ +void * WINAPI RtlFindExportedRoutineByName( HMODULE module, const char *name ) +{ + const IMAGE_EXPORT_DIRECTORY *exports; + const DWORD *functions; + DWORD exp_size; + int ordinal; + exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + if (!exports || exp_size < sizeof(*exports)) return NULL; + + if ((ordinal = find_name_in_exports( module, exports, name )) == -1) return NULL; + if (ordinal >= exports->NumberOfFunctions) return NULL; + functions = get_rva( module, exports->AddressOfFunctions ); + if (!functions[ordinal]) return NULL; + return get_rva( module, functions[ordinal] ); } @@ -1076,10 +1112,9 @@ static void free_tls_slot( LDR_DATA_TABLE_ENTRY *mod ) */ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void **entry ) { - IMAGE_EXPORT_DIRECTORY *exports; - DWORD exp_size; NTSTATUS status; - void *proc = NULL; + void *proc; + const char *name; WINE_MODREF *prev, *imp; if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ @@ -1101,13 +1136,8 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * TRACE( "loaded mscoree for %s\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); - if ((exports = RtlImageDirectoryEntryToData( imp->ldr.DllBase, TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) - { - const char *name = (wm->ldr.Flags & LDR_IMAGE_IS_DLL) ? "_CorDllMain" : "_CorExeMain"; - proc = find_named_export( imp->ldr.DllBase, exports, exp_size, name, -1, load_path ); - } - if (!proc) return STATUS_PROCEDURE_NOT_FOUND; + name = (wm->ldr.Flags & LDR_IMAGE_IS_DLL) ? "_CorDllMain" : "_CorExeMain"; + if (!(proc = RtlFindExportedRoutineByName( imp->ldr.DllBase, name ))) return STATUS_PROCEDURE_NOT_FOUND; *entry = proc; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 94ebca02f35..0ccd06d351f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -653,6 +653,7 @@ @ stdcall RtlFindClearBits(ptr long long) @ stdcall RtlFindClearBitsAndSet(ptr long long) @ stdcall RtlFindClearRuns(ptr ptr long long) +@ stdcall RtlFindExportedRoutineByName(ptr str) @ stdcall RtlFindLastBackwardRunClear(ptr long ptr) @ stdcall RtlFindLastBackwardRunSet(ptr long ptr) @ stdcall RtlFindLeastSignificantBit(int64) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 112be80c01e..8f5b0092bea 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -33,6 +33,7 @@ static DWORD64 (WINAPI *pGetEnabledXStateFeatures)(void); static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZE_T, INITIAL_TEB *); static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); +static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); @@ -996,6 +997,16 @@ static void test_syscalls(void) } perform_relocations( ptr, delta ); pNtClose = (void *)GetProcAddress( module, "NtClose" ); + + if (pRtlFindExportedRoutineByName) + { + void *func = pRtlFindExportedRoutineByName( module, "NtClose" ); + ok( func == (void *)pNtClose, "wrong ptr %p / %p\n", func, pNtClose ); + func = pRtlFindExportedRoutineByName( ptr, "NtClose" ); + ok( (char *)func - (char *)pNtClose == delta, "wrong ptr %p / %p\n", func, pNtClose ); + } + else win_skip( "RtlFindExportedRoutineByName not supported\n" ); + if (!memcmp( pNtClose, (char *)pNtClose + delta, 32 )) { pNtClose = (void *)((char *)pNtClose + delta); @@ -1041,6 +1052,7 @@ START_TEST(virtual) mod = GetModuleHandleA("ntdll.dll"); pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); + pRtlFindExportedRoutineByName = (void *)GetProcAddress(mod, "RtlFindExportedRoutineByName"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); diff --git a/include/winternl.h b/include/winternl.h index 69d0e32f1d4..4ccd68daa5f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4013,6 +4013,7 @@ NTSYSAPI NTSTATUS WINAPI RtlFindCharInUnicodeString(int,const UNICODE_STRING*,c NTSYSAPI ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindClearRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); +NTSYSAPI void * WINAPI RtlFindExportedRoutineByName(HMODULE,const char*); NTSYSAPI ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP,ULONG,PULONG); NTSYSAPI ULONG WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP,ULONG,PULONG); NTSYSAPI CCHAR WINAPI RtlFindLeastSignificantBit(ULONGLONG);

1 0

Alexandre Julliard : ntdll: Return the full path to start.exe in load_start_exe().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 75b1db42e53ec70a4698309ddbe7810dc367252e URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b1db42e53ec70a4698309d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 11:04:40 2021 +0200 ntdll: Return the full path to start.exe in load_start_exe(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e78df4d73d2..42bcb6f14b8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1625,22 +1625,20 @@ failed: NTSTATUS load_start_exe( WCHAR **image, void **module ) { static const WCHAR startW[] = {'s','t','a','r','t','.','e','x','e',0}; - WCHAR buffer[sizeof("\\??\\C:\\windows\\system32\\start.exe")]; UNICODE_STRING nt_name; NTSTATUS status; SIZE_T size; - wcscpy( buffer, get_machine_wow64_dir( current_machine )); - wcscat( buffer, startW ); - init_unicode_string( &nt_name, buffer ); + *image = malloc( sizeof("\\??\\C:\\windows\\system32\\start.exe") * sizeof(WCHAR) ); + wcscpy( *image, get_machine_wow64_dir( current_machine )); + wcscat( *image, startW ); + init_unicode_string( &nt_name, *image ); status = find_builtin_dll( &nt_name, module, &size, &main_image_info, current_machine, FALSE ); if (status) { MESSAGE( "wine: failed to load start.exe: %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } - *image = malloc( sizeof(startW) ); - memcpy( *image, startW, sizeof(startW) ); return status; }

1 0

Alexandre Julliard : ntdll: Open the per-application key for load order at startup.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: d47a711e986342a0f6b9fe520f2a34378877cd61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47a711e986342a0f6b9fe52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 10:55:36 2021 +0200 ntdll: Open the per-application key for load order at startup. It avoids accessing process parameters after startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/loadorder.c | 55 ++++++++++++++++-------------------------- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 42bcb6f14b8..8431ad0d6b1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1870,6 +1870,7 @@ static void start_main_thread(void) if (p___wine_main_argc) *p___wine_main_argc = main_argc; if (p___wine_main_argv) *p___wine_main_argv = main_argv; if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; + set_load_order_app_name( main_wargv[0] ); virtual_alloc_thread_stack( &stack, 0, 0, NULL ); teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 5285bb58007..4d7ad24d2b7 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -55,6 +55,8 @@ static struct static const WCHAR separatorsW[] = {',',' ','\t',0}; +static HANDLE std_key; +static HANDLE app_key; static BOOL init_done; @@ -221,6 +223,9 @@ static void init_load_order(void) WCHAR *entry, *next, *order; const char *overrides = getenv( "WINEDLLOVERRIDES" ); + /* @@ Wine registry key: HKCU\Software\Wine\DllOverrides */ + open_hkcu_key( "Software\\Wine\\DllOverrides", &std_key ); + init_done = TRUE; if (!overrides) return; @@ -264,37 +269,16 @@ static inline enum loadorder get_env_load_order( const WCHAR *module ) /*************************************************************************** - * get_standard_key - * - * Return a handle to the standard DllOverrides registry section. - */ -static HANDLE get_standard_key(void) -{ - static HANDLE std_key = (HANDLE)-1; - - if (std_key == (HANDLE)-1) - { - /* @@ Wine registry key: HKCU\Software\Wine\DllOverrides */ - if (open_hkcu_key( "Software\\Wine\\DllOverrides", &std_key )) std_key = 0; - } - return std_key; -} - - -/*************************************************************************** - * get_app_key + * open_app_key * * Get the registry key for the app-specific DllOverrides list. */ -static HANDLE get_app_key( const WCHAR *app_name ) +static HANDLE open_app_key( const WCHAR *app_name ) { static const WCHAR dlloverridesW[] = {'\\','D','l','l','O','v','e','r','r','i','d','e','s',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - HANDLE root; - static HANDLE app_key = (HANDLE)-1; - - if (app_key != (HANDLE)-1) return app_key; + HANDLE root, app_key = 0; if (!open_hkcu_key( "Software\\Wine\\AppDefaults", &root )) { @@ -306,7 +290,7 @@ static HANDLE get_app_key( const WCHAR *app_name ) InitializeObjectAttributes( &attr, &nameW, 0, root, NULL ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DllOverrides */ - if (NtOpenKey( &app_key, KEY_ALL_ACCESS, &attr )) app_key = 0; + NtOpenKey( &app_key, KEY_ALL_ACCESS, &attr ); NtClose( root ); free( nameW.Buffer ); } @@ -372,6 +356,18 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA } +/*************************************************************************** + * set_load_order_app_name + */ +void set_load_order_app_name( const WCHAR *app_name ) +{ + const WCHAR *p; + + if ((p = wcsrchr( app_name, '\\' ))) app_name = p + 1; + app_key = open_app_key( app_name ); +} + + /*************************************************************************** * get_load_order (internal) * @@ -382,21 +378,12 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; enum loadorder ret = LO_INVALID; - HANDLE std_key, app_key = 0; const WCHAR *path = nt_name->Buffer; const WCHAR *p, *app_name = NULL; WCHAR *module, *basename; int len; if (!init_done) init_load_order(); - std_key = get_standard_key(); - - if (NtCurrentTeb()->Peb->ImageBaseAddress) - { - app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; - if ((p = wcsrchr( app_name, '\\' ))) app_name = p + 1; - app_key = get_app_key( app_name ); - } if (!wcsncmp( path, prefixW, 4 )) path += 4; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c47695c408c..d3398fed258 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -410,6 +410,7 @@ enum loadorder LO_DEFAULT /* nothing specified, use default strategy */ }; +extern void set_load_order_app_name( const WCHAR *app_name ) DECLSPEC_HIDDEN; extern enum loadorder get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; static inline size_t ntdll_wcslen( const WCHAR *str )

1 0

Zebediah Figura : d3d11: Turn MultisampleEnable into a stub.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: ca1e2f5ccefd577bfede4b0350bba4fa185e723f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1e2f5ccefd577bfede4b03… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 4 22:56:51 2021 -0500 d3d11: Turn MultisampleEnable into a stub. The actual effect of this is to change the algorithm for line multisampling. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++-------------- dlls/d3d11/state.c | 7 +++++++ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ee6ecd2c29c..a2c6c7a75ae 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1142,25 +1142,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon ID3D11RasterizerState *rasterizer_state) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; - const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) - { - wined3d_device_context_set_rasterizer_state(context->wined3d_context, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); - wined3d_mutex_unlock(); - return; - } - - wined3d_device_context_set_rasterizer_state(context->wined3d_context, rasterizer_state_impl->wined3d_state); - - desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); + rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state); + wined3d_device_context_set_rasterizer_state(context->wined3d_context, + rasterizer_state_impl ? rasterizer_state_impl->wined3d_state : NULL); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 6b287176536..d31ea16bbe8 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1152,6 +1152,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.scissor = desc->ScissorEnable; wined3d_desc.line_antialias = desc->AntialiasedLineEnable; + if (desc->MultisampleEnable) + { + static unsigned int once; + if (!once++) + FIXME("Ignoring MultisampleEnable %#x.\n", desc->MultisampleEnable); + } + /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc,

1 0