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

Nikolay Sivov : mfplay: Partially implement SetMediaItem().
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 57dd39384b6de15a99cd30e9e2981424909ff833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57dd39384b6de15a99cd30e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:28 2021 +0300 mfplay: Partially implement SetMediaItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 132 insertions(+), 6 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0c72395ab1e..7360042ee54 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -28,8 +29,12 @@ #include "wine/debug.h" +#include "initguid.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +DEFINE_GUID(_MF_TOPO_MEDIA_ITEM, 0x6c1bb4df, 0x59ba, 0x4020, 0x85, 0x0c, 0x35, 0x79, 0xa2, 0x7a, 0xe2, 0x51); + static const WCHAR eventclassW[] = L"MediaPlayerEventCallbackClass"; static LONG startup_refcount; @@ -549,6 +554,14 @@ static const IMFPMediaItemVtbl media_item_vtbl = media_item_GetMetadata, }; +static struct media_item *unsafe_impl_from_IMFPMediaItem(IMFPMediaItem *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IMFPMediaItemVtbl *)&media_item_vtbl); + return CONTAINING_RECORD(iface, struct media_item, IMFPMediaItem_iface); +} + static HRESULT create_media_item(IMFPMediaPlayer *player, DWORD_PTR user_data, struct media_item **item) { struct media_item *object; @@ -822,11 +835,106 @@ static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *if return E_NOTIMPL; } -static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item) +static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) { - FIXME("%p, %p.\n", iface, item); + IMFMediaTypeHandler *handler; + HRESULT hr; - return E_NOTIMPL; + if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler))) + { + hr = IMFMediaTypeHandler_GetMajorType(handler, major); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + +static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) +{ + IMFTopologyNode *src_node, *sink_node; + IMFActivate *sar_activate; + IMFStreamDescriptor *sd; + IMFTopology *topology; + unsigned int idx; + BOOL selected; + HRESULT hr; + GUID major; + + if (FAILED(hr = MFCreateTopology(&topology))) + return hr; + + /* FIXME: handle user sinks */ + + /* Use first stream if none selected. */ + if (player->output_window) + { + FIXME("Video streams are not handled.\n"); + } + + /* Set up audio branches for all selected streams. */ + + idx = 0; + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) + { + if (selected && SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + { + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node))) + { + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + + IMFTopology_AddNode(topology, src_node); + } + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node))) + { + if (SUCCEEDED(MFCreateAudioRendererActivate(&sar_activate))) + { + IMFTopologyNode_SetObject(sink_node, (IUnknown *)sar_activate); + IMFActivate_Release(sar_activate); + } + + IMFTopology_AddNode(topology, sink_node); + } + + if (src_node && sink_node) + IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + + if (src_node) + IMFTopologyNode_Release(src_node); + if (sink_node) + IMFTopologyNode_Release(sink_node); + } + + IMFStreamDescriptor_Release(sd); + } + + *out = topology; + + return S_OK; +} + +static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item_iface) +{ + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + struct media_item *item = unsafe_impl_from_IMFPMediaItem(item_iface); + IMFTopology *topology; + HRESULT hr; + + TRACE("%p, %p.\n", iface, item_iface); + + if (item->player != iface) + return E_INVALIDARG; + + if (FAILED(hr = media_item_create_topology(player, item, &topology))) + return hr; + + IMFTopology_SetUnknown(topology, &_MF_TOPO_MEDIA_ITEM, (IUnknown *)item_iface); + hr = IMFMediaSession_SetTopology(player->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); + IMFTopology_Release(topology); + + return hr; } static HRESULT WINAPI media_player_ClearMediaItem(IMFPMediaPlayer *iface) @@ -1267,6 +1375,8 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba MFP_MEDIAPLAYER_STATE state; MFP_EVENT_TYPE event_type; HRESULT hr, event_status; + IMFPMediaItem *item = NULL; + IMFTopology *topology; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; @@ -1274,6 +1384,12 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_GetType(session_event, &session_event_type); IMFMediaEvent_GetStatus(session_event, &event_status); + if (SUCCEEDED(IMFMediaSession_GetFullTopology(player->session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology))) + { + IMFTopology_GetUnknown(topology, &_MF_TOPO_MEDIA_ITEM, &IID_IMFPMediaItem, (void **)&item); + IMFTopology_Release(topology); + } + switch (session_event_type) { case MESessionStarted: @@ -1302,17 +1418,27 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba /* FIXME: set pMediaItem */ media_player_queue_event(player, event); - IUnknown_Release(&event->IUnknown_iface); + + break; + + case MESessionTopologySet: + + media_event_create(player, MFP_EVENT_TYPE_MEDIAITEM_SET, event_status, &event); + event->u.generic.item = item; + if (event->u.generic.item) + IMFPMediaItem_AddRef(event->u.generic.item); + media_player_queue_event(player, event); break; default: ; } + if (item) + IMFPMediaItem_Release(item); + if (event) - { IUnknown_Release(&event->IUnknown_iface); - } IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); IMFMediaEvent_Release(session_event);

1 0

Zebediah Figura : netapi32: Move change_password_smb() to the Unix library.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 1542fe9bcaac512aa46000f9fc25c894a48061ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=1542fe9bcaac512aa46000f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:35:42 2021 -0500 netapi32: Move change_password_smb() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 161 +---------------------------------------------- dlls/netapi32/unixlib.c | 99 +++++++++++++++++++++++++++++ dlls/netapi32/unixlib.h | 2 + 3 files changed, 104 insertions(+), 158 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 62c4ba138ac..44d23a602c7 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -25,14 +25,6 @@ #include "wine/port.h" #include <stdarg.h> -#include <fcntl.h> -#include <errno.h> -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -68,60 +60,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE netapi32_instance; -static CPTABLEINFO unix_cptable; -static ULONG unix_cp; - -static BOOL get_unix_codepage(void) -{ - static const WCHAR wineunixcpW[] = {'W','I','N','E','U','N','I','X','C','P',0}; - UNICODE_STRING name, value; - WCHAR value_buffer[13]; - SIZE_T size; - void *ptr; - - if (unix_cp) return TRUE; - - RtlInitUnicodeString( &name, wineunixcpW ); - value.Buffer = value_buffer; - value.MaximumLength = sizeof(value_buffer); - if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) - RtlUnicodeStringToInteger( &value, 10, &unix_cp ); - if (NtGetNlsSectionPtr( 11, unix_cp, NULL, &ptr, &size )) - return FALSE; - RtlInitCodePageTable( ptr, &unix_cptable ); - return TRUE; -} - -static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) -{ - DWORD srclen = (strlenW( src ) + 1) * sizeof(WCHAR); - DWORD len; - - get_unix_codepage(); - - if (unix_cp == CP_UTF8) - { - RtlUnicodeToUTF8N( dst, dstlen, &len, src, srclen ); - return len; - } - else - { - len = (strlenW( src ) * 2) + 1; - if (dst) RtlUnicodeToCustomCPN( &unix_cptable, dst, dstlen, &len, src, srclen ); - return len; - } -} - -static char *strdup_unixcp( const WCHAR *str ) -{ - char *ret; - - int len = netapi_wcstoumbs( str, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) - netapi_wcstoumbs( str, ret, len ); - return ret; -} - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static const struct samba_funcs *samba_funcs; @@ -2087,101 +2025,6 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } -static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, - LPCWSTR oldpassword, LPCWSTR newpassword ) -{ -#ifdef HAVE_FORK - NET_API_STATUS ret = NERR_Success; - static char option_silent[] = "-s"; - static char option_user[] = "-U"; - static char option_remote[] = "-r"; - static char smbpasswd[] = "smbpasswd"; - int pipe_out[2]; - pid_t pid, wret; - int status; - char *server = NULL, *user, *argv[7], *old = NULL, *new = NULL; - - if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; - if (!(user = strdup_unixcp( username ))) - { - ret = ERROR_OUTOFMEMORY; - goto end; - } - if (!(old = strdup_unixcp( oldpassword ))) - { - ret = ERROR_OUTOFMEMORY; - goto end; - } - if (!(new = strdup_unixcp( newpassword ))) - { - ret = ERROR_OUTOFMEMORY; - goto end; - } - argv[0] = smbpasswd; - argv[1] = option_silent; - argv[2] = option_user; - argv[3] = user; - if (server) - { - argv[4] = option_remote; - argv[5] = server; - argv[6] = NULL; - } - else argv[4] = NULL; - - if (pipe( pipe_out ) == -1) - { - ret = NERR_InternalError; - goto end; - } - fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); - fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); - - switch ((pid = fork())) - { - case -1: - close( pipe_out[0] ); - close( pipe_out[1] ); - ret = NERR_InternalError; - goto end; - case 0: - dup2( pipe_out[0], 0 ); - close( pipe_out[0] ); - close( pipe_out[1] ); - execvp( "smbpasswd", argv ); - ERR( "can't execute smbpasswd, is it installed?\n" ); - _exit(1); - default: - close( pipe_out[0] ); - break; - } - write( pipe_out[1], old, strlen( old ) ); - write( pipe_out[1], "\n", 1 ); - write( pipe_out[1], new, strlen( new ) ); - write( pipe_out[1], "\n", 1 ); - write( pipe_out[1], new, strlen( new ) ); - write( pipe_out[1], "\n", 1 ); - close( pipe_out[1] ); - - do { - wret = waitpid(pid, &status, 0); - } while (wret < 0 && errno == EINTR); - - if (ret == NERR_Success && (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) - ret = NERR_InternalError; - -end: - HeapFree( GetProcessHeap(), 0, server ); - HeapFree( GetProcessHeap(), 0, user ); - HeapFree( GetProcessHeap(), 0, old ); - HeapFree( GetProcessHeap(), 0, new ); - return ret; -#else - ERR( "no fork support on this platform\n" ); - return NERR_InternalError; -#endif -} - /****************************************************************************** * NetUserChangePassword (NETAPI32.@) * PARAMS @@ -2204,7 +2047,9 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); - if (!change_password_smb( domainname, username, oldpassword, newpassword )) + if (!samba_init()) return ERROR_DLL_INIT_FAILED; + + if (!samba_funcs->change_password( domainname, username, oldpassword, newpassword )) return NERR_Success; if(domainname) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 3610abe2bde..1506e616c06 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -27,6 +27,14 @@ #include "wine/port.h" #include <stdarg.h> +#include <fcntl.h> +#include <errno.h> +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -949,12 +957,103 @@ static void libnetapi_init(void) #endif /* SONAME_LIBNETAPI */ +static NET_API_STATUS WINAPI change_password( const WCHAR *domainname, const WCHAR *username, + const WCHAR *oldpassword, const WCHAR *newpassword ) +{ + NET_API_STATUS ret = NERR_Success; + static char option_silent[] = "-s"; + static char option_user[] = "-U"; + static char option_remote[] = "-r"; + static char smbpasswd[] = "smbpasswd"; + int pipe_out[2]; + pid_t pid, wret; + int status; + char *server = NULL, *user, *argv[7], *old = NULL, *new = NULL; + + if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; + if (!(user = strdup_unixcp( username ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; + } + if (!(old = strdup_unixcp( oldpassword ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; + } + if (!(new = strdup_unixcp( newpassword ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; + } + argv[0] = smbpasswd; + argv[1] = option_silent; + argv[2] = option_user; + argv[3] = user; + if (server) + { + argv[4] = option_remote; + argv[5] = server; + argv[6] = NULL; + } + else argv[4] = NULL; + + if (pipe( pipe_out ) == -1) + { + ret = NERR_InternalError; + goto end; + } + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); + + switch ((pid = fork())) + { + case -1: + close( pipe_out[0] ); + close( pipe_out[1] ); + ret = NERR_InternalError; + goto end; + case 0: + dup2( pipe_out[0], 0 ); + close( pipe_out[0] ); + close( pipe_out[1] ); + execvp( "smbpasswd", argv ); + ERR( "can't execute smbpasswd, is it installed?\n" ); + _exit(1); + default: + close( pipe_out[0] ); + break; + } + write( pipe_out[1], old, strlen( old ) ); + write( pipe_out[1], "\n", 1 ); + write( pipe_out[1], new, strlen( new ) ); + write( pipe_out[1], "\n", 1 ); + write( pipe_out[1], new, strlen( new ) ); + write( pipe_out[1], "\n", 1 ); + close( pipe_out[1] ); + + do { + wret = waitpid(pid, &status, 0); + } while (wret < 0 && errno == EINTR); + + if (ret == NERR_Success && (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) + ret = NERR_InternalError; + +end: + RtlFreeHeap( GetProcessHeap(), 0, server ); + RtlFreeHeap( GetProcessHeap(), 0, user ); + RtlFreeHeap( GetProcessHeap(), 0, old ); + RtlFreeHeap( GetProcessHeap(), 0, new ); + return ret; +} + static const struct samba_funcs samba_funcs = { server_getinfo, share_add, share_del, wksta_getinfo, + change_password, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/netapi32/unixlib.h b/dlls/netapi32/unixlib.h index 9e84c035965..d5f18044bb5 100644 --- a/dlls/netapi32/unixlib.h +++ b/dlls/netapi32/unixlib.h @@ -24,4 +24,6 @@ struct samba_funcs NET_API_STATUS (WINAPI *share_add)( const WCHAR *server, DWORD level, const BYTE *buffer, DWORD *err ); NET_API_STATUS (WINAPI *share_del)( const WCHAR *server, const WCHAR *share, DWORD reserved ); NET_API_STATUS (WINAPI *wksta_getinfo)( const WCHAR *server, DWORD level, BYTE **buffer ); + NET_API_STATUS (WINAPI *change_password)( const WCHAR *domain, const WCHAR *user, + const WCHAR *old, const WCHAR *new ); };

1 0

Zebediah Figura : netapi32: Build with msvcrt.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 1904227cc363e0fed0fc69d038a0902010f9331b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1904227cc363e0fed0fc69d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:35:43 2021 -0500 netapi32: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 2 + dlls/netapi32/nbcmdqueue.c | 2 +- dlls/netapi32/nbnamecache.c | 3 -- dlls/netapi32/nbt.c | 64 +++++++++---------------------- dlls/netapi32/netapi32.c | 91 +++++++++++++++++++-------------------------- dlls/netapi32/netbios.c | 2 +- 6 files changed, 59 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1904227cc363e0fed0fc…

1 0

Alexandre Julliard : ntdll: Reuse the Unix name buffer for get_dos_device().
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 302d44004e5cab89f1c15e8920b79a1ecb287db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=302d44004e5cab89f1c15e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 12:52:19 2021 +0200 ntdll: Reuse the Unix name buffer for get_dos_device(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 65 ++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 0ba0ee7b586..9bf3b51ce8b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2771,41 +2771,19 @@ void init_files(void) * * Get the Unix path of a DOS device. */ -static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, char **unix_name_ret ) +static NTSTATUS get_dos_device( char **unix_name, int start_pos ) { struct stat st; - char *unix_name, *new_name, *dev; - unsigned int i; - int unix_len; - - /* make sure the device name is ASCII */ - for (i = 0; i < name_len; i++) - if (name[i] <= 32 || name[i] >= 127) return STATUS_BAD_DEVICE_TYPE; - - unix_len = strlen(config_dir) + sizeof("/dosdevices/") + name_len + 1; - - if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; - - strcpy( unix_name, config_dir ); - strcat( unix_name, "/dosdevices/" ); - dev = unix_name + strlen(unix_name); - - for (i = 0; i < name_len; i++) dev[i] = (name[i] >= 'A' && name[i] <= 'Z' ? name[i] + 32 : name[i]); - dev[i] = 0; + char *new_name, *dev = *unix_name + start_pos; /* special case for drive devices */ - if (name_len == 2 && dev[1] == ':') - { - dev[i++] = ':'; - dev[i] = 0; - } + if (dev[0] && dev[1] == ':' && !dev[2]) strcpy( dev + 1, "::" ); for (;;) { - if (!stat( unix_name, &st )) + if (!stat( *unix_name, &st )) { - TRACE( "%s -> %s\n", debugstr_wn(name,name_len), debugstr_a(unix_name) ); - *unix_name_ret = unix_name; + TRACE( "-> %s\n", debugstr_a(*unix_name)); return STATUS_SUCCESS; } if (!dev) break; @@ -2826,15 +2804,15 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, char **unix_na if (dev[1] == ':' && dev[2] == ':') /* drive device */ { dev[2] = 0; /* remove last ':' to get the drive mount point symlink */ - new_name = get_default_drive_device( unix_name ); + new_name = get_default_drive_device( *unix_name ); } - - if (!new_name) break; - free( unix_name ); - unix_name = new_name; + free( *unix_name ); + *unix_name = new_name; + if (!new_name) return STATUS_BAD_DEVICE_TYPE; dev = NULL; /* last try */ } - free( unix_name ); + free( *unix_name ); + *unix_name = NULL; return STATUS_BAD_DEVICE_TYPE; } @@ -3335,30 +3313,24 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } if (pos > MAX_DIR_ENTRY_LEN) return STATUS_OBJECT_NAME_INVALID; - if (pos == name_len) /* no subdir, plain DOS device */ - return get_dos_device( name, name_len, unix_name_ret ); - prefix_len = pos; prefix[prefix_len] = 0; - name += prefix_len; - name_len -= prefix_len; - /* check for invalid characters (all chars except 0 are valid for unix) */ is_unix = (prefix_len == 4 && !memcmp( prefix, unixW, sizeof(unixW) )); if (is_unix) { - for (p = name; p < name + name_len; p++) + for (p = name + prefix_len; p < name + name_len; p++) if (!*p) return STATUS_OBJECT_NAME_INVALID; check_case = TRUE; } else { - for (p = name; p < name + name_len; p++) + for (p = name + prefix_len; p < name + name_len; p++) if (*p < 32 || wcschr( invalid_charsW, *p )) return STATUS_OBJECT_NAME_INVALID; } - unix_len = (prefix_len + name_len) * 3 + MAX_DIR_ENTRY_LEN + 3; + unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; unix_len += strlen(config_dir) + sizeof("/dosdevices/"); if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; strcpy( unix_name, config_dir ); @@ -3371,6 +3343,12 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret free( unix_name ); return STATUS_OBJECT_NAME_INVALID; } + + if (prefix_len == name_len) /* no subdir, plain DOS device */ + { + *unix_name_ret = unix_name; + return get_dos_device( unix_name_ret, pos ); + } pos += ret; /* check if prefix exists (except for DOS drives to avoid extra stat calls) */ @@ -3389,6 +3367,9 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } } + name += prefix_len; + name_len -= prefix_len; + status = lookup_unix_name( name, name_len, &unix_name, unix_len, pos, disposition, check_case ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) {

1 0

Alexandre Julliard : ntdll: Initialize version and session id on the Unix side.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 8ffb9b31d0863ec95688ebda7fe05ba952eb8a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ffb9b31d0863ec95688ebda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 12:09:53 2021 +0200 ntdll: Initialize version and session id on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 12 ++++++++++++ dlls/ntdll/loader.c | 5 ----- dlls/ntdll/unix/virtual.c | 12 ++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 433c12ff1fb..b932a3c2a15 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3455,6 +3455,18 @@ static void test_SuspendProcessState(void) "wrong entry point %p/%p\n", entry_ptr, (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint ); + ok( !child_peb.LdrData, "LdrData set %p\n", child_peb.LdrData ); + ok( !child_peb.FastPebLock, "FastPebLock set %p\n", child_peb.FastPebLock ); + ok( !child_peb.TlsBitmap, "TlsBitmap set %p\n", child_peb.TlsBitmap ); + ok( !child_peb.TlsExpansionBitmap, "TlsExpansionBitmap set %p\n", child_peb.TlsExpansionBitmap ); + ok( !child_peb.LoaderLock, "LoaderLock set %p\n", child_peb.LoaderLock ); + ok( !child_peb.ProcessHeap, "ProcessHeap set %p\n", child_peb.ProcessHeap ); + ok( !child_peb.CSDVersion.Buffer, "CSDVersion set %s\n", debugstr_w(child_peb.CSDVersion.Buffer) ); + + ok( child_peb.OSMajorVersion, "OSMajorVersion not set %u\n", child_peb.OSMajorVersion ); + ok( child_peb.OSPlatformId == VER_PLATFORM_WIN32_NT, "OSPlatformId not set %u\n", child_peb.OSPlatformId ); + ok( child_peb.SessionId == 1, "SessionId not set %u\n", child_peb.SessionId ); + ret = SetThreadContext(pi.hThread, &ctx); ok(ret, "Failed to set remote thread context (%d)\n", GetLastError()); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 160a16daff8..153b4a02769 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3636,11 +3636,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->LoaderLock = &loader_section; - peb->OSMajorVersion = 5; - peb->OSMinorVersion = 1; - peb->OSBuildNumber = 0xA28; - peb->OSPlatformId = VER_PLATFORM_WIN32_NT; - peb->SessionId = 1; peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 659ad2421d4..b0ff26ade53 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2805,6 +2805,17 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam } +/* set some initial values in the new PEB */ +static void init_peb( PEB *peb ) +{ + peb->OSMajorVersion = 6; + peb->OSMinorVersion = 1; + peb->OSBuildNumber = 0x1db1; + peb->OSPlatformId = VER_PLATFORM_WIN32_NT; + peb->SessionId = 1; +} + + /* set some initial values in a new TEB */ static void init_teb( TEB *teb, PEB *peb ) { @@ -2870,6 +2881,7 @@ TEB *virtual_alloc_first_teb(void) peb = (PEB *)((char *)teb_block + 32 * block_size - peb_size); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&peb, 0, &peb_size, MEM_COMMIT, PAGE_READWRITE ); + init_peb( peb ); init_teb( teb, peb ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); return teb;

1 0

Alexandre Julliard : winedbg: Use GetMappedFileNameW() as fallback when fetching module names.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: c050df1250f81a2e7f1658fe282ce207be6c8e5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c050df1250f81a2e7f1658fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 12:29:38 2021 +0200 winedbg: Use GetMappedFileNameW() as fallback when fetching module names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 + programs/winedbg/gdbproxy.c | 6 ++---- programs/winedbg/tgt_active.c | 23 ++++++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3bcf9d37f23..b7c765ac545 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -419,6 +419,7 @@ extern enum dbg_start dbg_active_auto(int argc, char* argv[]); extern enum dbg_start dbg_active_minidump(int argc, char* argv[]); extern void dbg_active_wait_for_first_exception(void); extern BOOL dbg_attach_debuggee(DWORD pid); +extern void fetch_module_name(void* name_addr, void* mod_addr, WCHAR* buffer, size_t bufsz); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4fd669032ec..478e0d16fe0 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -443,10 +443,8 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) return TRUE; case LOAD_DLL_DEBUG_EVENT: - memory_get_string_indirect(gdbctx->process, - de->u.LoadDll.lpImageName, - de->u.LoadDll.fUnicode, - u.buffer, ARRAY_SIZE(u.buffer)); + fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, + u.buffer, ARRAY_SIZE(u.buffer) ); fprintf(stderr, "%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, dbg_W2A(u.buffer, -1), diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a38fe41dfc5..c9072d5b81c 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -296,16 +296,23 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill); -static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, - WCHAR* buffer, size_t bufsz) +void fetch_module_name(void* name_addr, void* mod_addr, WCHAR* buffer, size_t bufsz) { static const WCHAR dlladdr[] = {'D','L','L','_','%','0','8','l','x',0}; - memory_get_string_indirect(dbg_curr_process, name_addr, unicode, buffer, bufsz); - if (!buffer[0] && - !GetModuleFileNameExW(dbg_curr_process->handle, mod_addr, buffer, bufsz)) + memory_get_string_indirect(dbg_curr_process, name_addr, TRUE, buffer, bufsz); + if (!buffer[0] && !GetModuleFileNameExW(dbg_curr_process->handle, mod_addr, buffer, bufsz)) { - snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); + if (GetMappedFileNameW( dbg_curr_process->handle, mod_addr, buffer, bufsz )) + { + /* FIXME: proper NT->Dos conversion */ + static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; + + if (!strncmpW( buffer, nt_prefixW, 4 )) + memmove( buffer, buffer + 4, (lstrlenW(buffer + 4) + 1) * sizeof(WCHAR) ); + } + else + snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); } } @@ -462,9 +469,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) WINE_ERR("Unknown thread\n"); break; } - fetch_module_name(de->u.LoadDll.lpImageName, - de->u.LoadDll.fUnicode, - de->u.LoadDll.lpBaseOfDll, + fetch_module_name(de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, u.buffer, ARRAY_SIZE(u.buffer)); WINE_TRACE("%04x:%04x: loads DLL %s @%p (%u<%u>)\n",

1 0

Alexandre Julliard : winedbg: Use QueryFullProcessImageNameW to retrieve the main image name.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 39b20a2bd375828739fb3d3f141ad5dade76bb80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b20a2bd375828739fb3d3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 12:14:15 2021 +0200 winedbg: Use QueryFullProcessImageNameW to retrieve the main image name. Remove the psapi fallback that didn't work anyway. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 7 +++---- programs/winedbg/tgt_active.c | 36 ++++++++++-------------------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index a19b5950ccc..4fd669032ec 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -404,6 +404,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) char bufferA[256]; WCHAR buffer[256]; } u; + DWORD size; gdbctx->exec_tid = de->dwThreadId; gdbctx->other_tid = de->dwThreadId; @@ -417,10 +418,8 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) if (!gdbctx->process) return TRUE; - memory_get_string_indirect(gdbctx->process, - de->u.CreateProcessInfo.lpImageName, - de->u.CreateProcessInfo.fUnicode, - u.buffer, ARRAY_SIZE(u.buffer)); + size = ARRAY_SIZE(u.buffer); + QueryFullProcessImageNameW( gdbctx->process->handle, 0, u.buffer, &size ); dbg_set_process_name(gdbctx->process, u.buffer); fprintf(stderr, "%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index e71f4615735..a38fe41dfc5 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -297,33 +297,15 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill); static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, - WCHAR* buffer, size_t bufsz, BOOL is_pcs) + WCHAR* buffer, size_t bufsz) { - static const WCHAR pcspid[] = {'P','r','o','c','e','s','s','_','%','0','8','x',0}; static const WCHAR dlladdr[] = {'D','L','L','_','%','0','8','l','x',0}; memory_get_string_indirect(dbg_curr_process, name_addr, unicode, buffer, bufsz); if (!buffer[0] && !GetModuleFileNameExW(dbg_curr_process->handle, mod_addr, buffer, bufsz)) { - if (is_pcs) - { - HMODULE h; - WORD (WINAPI *gpif)(HANDLE, LPWSTR, DWORD); - - /* On Windows, when we get the process creation debug event for a process - * created by winedbg, the modules' list is not initialized yet. Hence, - * GetModuleFileNameExA (on the main module) will generate an error. - * Psapi (starting on XP) provides GetProcessImageFileName() which should - * give us the expected result - */ - if (!(h = GetModuleHandleA("psapi")) || - !(gpif = (void*)GetProcAddress(h, "GetProcessImageFileNameW")) || - !(gpif)(dbg_curr_process->handle, buffer, bufsz)) - snprintfW(buffer, bufsz, pcspid, dbg_curr_pid); - } - else - snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); + snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); } } @@ -333,7 +315,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) char bufferA[256]; WCHAR buffer[256]; } u; - DWORD cont = DBG_CONTINUE; + DWORD size, cont = DBG_CONTINUE; dbg_curr_pid = de->dwProcessId; dbg_curr_tid = de->dwThreadId; @@ -383,10 +365,12 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) WINE_ERR("Couldn't create process\n"); break; } - fetch_module_name(de->u.CreateProcessInfo.lpImageName, - de->u.CreateProcessInfo.fUnicode, - de->u.CreateProcessInfo.lpBaseOfImage, - u.buffer, ARRAY_SIZE(u.buffer), TRUE); + size = ARRAY_SIZE(u.buffer); + if (!QueryFullProcessImageNameW( dbg_curr_process->handle, 0, u.buffer, &size )) + { + static const WCHAR pcspid[] = {'P','r','o','c','e','s','s','_','%','0','8','x',0}; + snprintfW( u.buffer, ARRAY_SIZE(u.buffer), pcspid, dbg_curr_pid); + } WINE_TRACE("%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, @@ -481,7 +465,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) fetch_module_name(de->u.LoadDll.lpImageName, de->u.LoadDll.fUnicode, de->u.LoadDll.lpBaseOfDll, - u.buffer, ARRAY_SIZE(u.buffer), FALSE); + u.buffer, ARRAY_SIZE(u.buffer)); WINE_TRACE("%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId,

1 0

Zebediah Figura : netapi32: Use ntdll functions for CP_UNIXCP codepage conversions.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 8b613d13509d8d93a9541479d3c3b6c7b943d83d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b613d13509d8d93a9541479… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:35:40 2021 -0500 netapi32: Use ntdll functions for CP_UNIXCP codepage conversions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 118 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b613d13509d8d93a954…

1 0

Alexandre Julliard : ntdll: Reject NT path names that are not in canonical form.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 405666b736f7e471e301f051cfbe68bcbef7e0f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405666b736f7e471e301f051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 12:55:59 2021 +0200 ntdll: Reject NT path names that are not in canonical form. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/file.c | 99 ++++++++++++++++++++++++++----------------------- 2 files changed, 144 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=405666b736f7e471e301…

1 0

Zhiyi Zhang : ntdll: Initialize nt_name before using it.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 14b44920862ea91234c0a2468606dca9e3d16d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b44920862ea91234c0a246… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 13 11:59:32 2021 +0800 ntdll: Initialize nt_name before using it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50979 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 28d2be0b770..6819342987c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1484,6 +1484,7 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; + init_unicode_string( &nt_name, *image ); loadorder = get_load_order( &nt_name ); status = open_main_image( *image, module, &main_image_info, loadorder ); if (status != STATUS_DLL_NOT_FOUND) return status;

1 0