November 2013 - Wine-commits

Hans Leidekker : advapi32: Return a fake handle from LogonUserW.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 02970b578eb3bd46810508f622437e107abc541d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02970b578eb3bd46810508f62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:31:54 2013 +0100 advapi32: Return a fake handle from LogonUserW. --- dlls/advapi32/advapi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 7025a21..860c728 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -280,6 +280,7 @@ BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPa FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_w(lpszUsername), debugstr_w(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); + *phToken = (HANDLE *)0xdeadbeef; return TRUE; }

1 0

Hans Leidekker : advapi32: Forward LogonUserA to LogonUserW.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 7519cddddbe602c57caa078b88396e5654d68c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7519cddddbe602c57caa078b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:32:55 2013 +0100 advapi32: Forward LogonUserA to LogonUserW. --- dlls/advapi32/advapi.c | 19 +++++++++++++++++-- dlls/advapi32/advapi32_misc.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 860c728..884b5d1 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -35,6 +35,8 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "advapi32_misc.h" + WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** @@ -268,10 +270,23 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) { - FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_a(lpszUsername), + WCHAR *usernameW = NULL, *domainW = NULL, *passwordW = NULL; + BOOL ret = FALSE; + + TRACE("%s %s %p 0x%08x 0x%08x %p\n", debugstr_a(lpszUsername), debugstr_a(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); - return TRUE; + if (lpszUsername && !(usernameW = strdupAW( lpszUsername ))) return FALSE; + if (lpszDomain && !(domainW = strdupAW( lpszUsername ))) goto done; + if (lpszPassword && !(passwordW = strdupAW( lpszPassword ))) goto done; + + ret = LogonUserW( usernameW, domainW, passwordW, dwLogonType, dwLogonProvider, phToken ); + +done: + heap_free( usernameW ); + heap_free( domainW ); + heap_free( passwordW ); + return ret; } BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword, diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index ace73f1..9dd48b8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -22,6 +22,7 @@ #include "ntsecapi.h" #include "winsvc.h" +#include "winnls.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -52,4 +53,15 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + #endif /* __WINE_ADVAPI32MISC_H */

1 0

Hans Leidekker : include: Add some missing defines.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: d75dbbc00553e9024ff7a17bf1e22561631ffb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75dbbc00553e9024ff7a17bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:33:51 2013 +0100 include: Add some missing defines. --- include/lmaccess.h | 11 +++++++++++ include/lmshare.h | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/lmaccess.h b/include/lmaccess.h index 03bd504..5042f04 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -27,6 +27,17 @@ extern "C" { #include <lmcons.h> +#define ACCESS_NONE 0x0000 +#define ACCESS_READ 0x0001 +#define ACCESS_WRITE 0x0002 +#define ACCESS_CREATE 0x0004 +#define ACCESS_EXEC 0x0008 +#define ACCESS_DELETE 0x0010 +#define ACCESS_ATRIB 0x0020 +#define ACCESS_PERM 0x0040 +#define ACCESS_GROUP 0x8000 +#define ACCESS_ALL (ACCESS_READ|ACCESS_WRITE|ACCESS_CREATE|ACCESS_EXEC|ACCESS_DELETE|ACCESS_ATRIB|ACCESS_PERM) + #define UF_SCRIPT 0x000001 #define UF_ACCOUNTDISABLE 0x000002 #define UF_HOMEDIR_REQUIRED 0x000008 diff --git a/include/lmshare.h b/include/lmshare.h index def3f13..442cf5e 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -34,6 +34,30 @@ typedef struct _SHARE_INFO_1 { LMSTR shi1_remark; } SHARE_INFO_1, *PSHARE_INFO_1, *LPSHARE_INFO_1; +typedef struct _SHARE_INFO_2 { + LMSTR shi2_netname; + DWORD shi2_type; + LMSTR shi2_remark; + DWORD shi2_permissions; + DWORD shi2_max_uses; + DWORD shi2_current_uses; + LMSTR shi2_path; + LMSTR shi2_passwd; +} SHARE_INFO_2, *PSHARE_INFO_2, *LPSHARE_INFO_2; + +typedef struct _SHARE_INFO_502 { + LMSTR shi502_netname; + DWORD shi502_type; + LMSTR shi502_remark; + DWORD shi502_permissions; + DWORD shi502_max_uses; + DWORD shi502_current_uses; + LMSTR shi502_path; + LMSTR shi502_passwd; + DWORD shi502_reserved; + PSECURITY_DESCRIPTOR shi502_security_descriptor; +} SHARE_INFO_502, *PSHARE_INFO_502, *LPSHARE_INFO_502; + NET_API_STATUS WINAPI NetShareAdd(LMSTR,DWORD,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetShareCheck(LMSTR,LMSTR,LPDWORD); NET_API_STATUS WINAPI NetShareDel(LMSTR,LMSTR,DWORD);

1 0

Hans Leidekker : netapi32: Add support for remote computers in NetWkstaGetInfo.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: f3c78b1ba78fa4ae2ad698db6e2068fdbad4b225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c78b1ba78fa4ae2ad698db6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:34:29 2013 +0100 netapi32: Add support for remote computers in NetWkstaGetInfo. --- dlls/netapi32/netapi32.c | 90 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index e09c6ce..9ae040e 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -79,6 +79,7 @@ static DWORD (*plibnetapi_set_debuglevel)(void *, const char *); static NET_API_STATUS (*pNetApiBufferAllocate)(unsigned int, void **); static NET_API_STATUS (*pNetApiBufferFree)(void *); static NET_API_STATUS (*pNetServerGetInfo)(const char *, unsigned int, unsigned char **); +static NET_API_STATUS (*pNetWkstaGetInfo)(const char *, unsigned int, unsigned char **); static BOOL libnetapi_init(void) { @@ -106,6 +107,7 @@ static BOOL libnetapi_init(void) LOAD_FUNCPTR(NetApiBufferAllocate) LOAD_FUNCPTR(NetApiBufferFree) LOAD_FUNCPTR(NetServerGetInfo) + LOAD_FUNCPTR(NetWkstaGetInfo) #undef LOAD_FUNCPTR if ((status = plibnetapi_init( &libnetapi_ctx ))) @@ -202,6 +204,77 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf return status; } +struct wksta_info_100 +{ + unsigned int wki100_platform_id; + const char *wki100_computername; + const char *wki100_langroup; + unsigned int wki100_ver_major; + unsigned int wki100_ver_minor; +}; + +static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, BYTE **bufptr ) +{ + WKSTA_INFO_100 *ret; + struct wksta_info_100 *info = (struct wksta_info_100 *)buf; + DWORD len = 0; + WCHAR *ptr; + + if (info->wki100_computername) + len += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_computername, -1, NULL, 0 ); + if (info->wki100_langroup) + len += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_langroup, -1, NULL, 0 ); + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + (len * sizeof(WCHAR) )))) + return ERROR_OUTOFMEMORY; + + ptr = (WCHAR *)(ret + 1); + ret->wki100_platform_id = info->wki100_platform_id; + if (!info->wki100_computername) ret->wki100_computername = NULL; + else + { + ret->wki100_computername = ptr; + ptr += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_computername, -1, ptr, len ); + } + if (!info->wki100_langroup) ret->wki100_langroup = NULL; + else + { + ret->wki100_langroup = ptr; + MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_langroup, -1, ptr, len ); + } + ret->wki100_ver_major = info->wki100_ver_major; + ret->wki100_ver_minor = info->wki100_ver_minor; + *bufptr = (BYTE *)ret; + return NERR_Success; +} + +static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *buf, BYTE **bufptr ) +{ + switch (level) + { + case 100: return wksta_info_100_from_samba( buf, bufptr ); + default: + FIXME( "level %u not supported\n", level ); + return ERROR_NOT_SUPPORTED; + } +} + +static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) +{ + NET_API_STATUS status; + char *wksta = NULL; + unsigned char *buf = NULL; + + if (servername && !(wksta = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY; + status = pNetWkstaGetInfo( wksta, level, &buf ); + HeapFree( GetProcessHeap(), 0, wksta ); + if (!status) + { + status = wksta_info_from_samba( level, buf, bufptr ); + pNetApiBufferFree( buf ); + } + return status; +} + #else static BOOL libnetapi_init(void) @@ -214,6 +287,11 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf ERR( "\n" ); return ERROR_NOT_SUPPORTED; } +static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) +{ + ERR( "\n" ); + return ERROR_NOT_SUPPORTED; +} #endif /* SONAME_LIBNETAPI */ @@ -1015,15 +1093,15 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, LPBYTE* bufptr) { NET_API_STATUS ret; + BOOL local = NETAPI_IsLocalComputer( servername ); TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); - if (servername) + + if (!local) { - if (!NETAPI_IsLocalComputer(servername)) - { - FIXME("remote computers not supported\n"); - return ERROR_INVALID_LEVEL; - } + if (libnetapi_init()) return wksta_getinfo( servername, level, bufptr ); + FIXME( "remote computers not supported\n" ); + return ERROR_INVALID_LEVEL; } if (!bufptr) return ERROR_INVALID_PARAMETER;

1 0

Hans Leidekker : netapi32: Add support for remote computers in NetShareAdd.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 461eaca8a765875dccc6345825d5408b71420f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461eaca8a765875dccc634582… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:35:28 2013 +0100 netapi32: Add support for remote computers in NetShareAdd. --- dlls/netapi32/netapi32.c | 125 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 9ae040e..4223379 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -75,10 +75,13 @@ static void *libnetapi_ctx; static DWORD (*plibnetapi_init)(void **); static DWORD (*plibnetapi_free)(void *); static DWORD (*plibnetapi_set_debuglevel)(void *, const char *); +static DWORD (*plibnetapi_set_username)(void *, const char *); +static DWORD (*plibnetapi_set_password)(void *, const char *); static NET_API_STATUS (*pNetApiBufferAllocate)(unsigned int, void **); static NET_API_STATUS (*pNetApiBufferFree)(void *); static NET_API_STATUS (*pNetServerGetInfo)(const char *, unsigned int, unsigned char **); +static NET_API_STATUS (*pNetShareAdd)(const char *, unsigned int, unsigned char *, unsigned int *); static NET_API_STATUS (*pNetWkstaGetInfo)(const char *, unsigned int, unsigned char **); static BOOL libnetapi_init(void) @@ -103,10 +106,13 @@ static BOOL libnetapi_init(void) LOAD_FUNCPTR(libnetapi_init) LOAD_FUNCPTR(libnetapi_free) LOAD_FUNCPTR(libnetapi_set_debuglevel) + LOAD_FUNCPTR(libnetapi_set_username) + LOAD_FUNCPTR(libnetapi_set_password) LOAD_FUNCPTR(NetApiBufferAllocate) LOAD_FUNCPTR(NetApiBufferFree) LOAD_FUNCPTR(NetServerGetInfo) + LOAD_FUNCPTR(NetShareAdd) LOAD_FUNCPTR(NetWkstaGetInfo) #undef LOAD_FUNCPTR @@ -120,6 +126,17 @@ static BOOL libnetapi_init(void) ERR( "Failed to set debug level %u\n", status ); goto error; } + /* perform an anonymous login by default (avoids a password prompt) */ + if ((status = plibnetapi_set_username( libnetapi_ctx, "Guest" ))) + { + ERR( "Failed to set username %u\n", status ); + goto error; + } + if ((status = plibnetapi_set_password( libnetapi_ctx, "" ))) + { + ERR( "Failed to set password %u\n", status ); + goto error; + } return TRUE; error: @@ -204,6 +221,97 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf return status; } +struct share_info_2 +{ + const char *shi2_netname; + unsigned int shi2_type; + const char *shi2_remark; + unsigned int shi2_permissions; + unsigned int shi2_max_uses; + unsigned int shi2_current_uses; + const char *shi2_path; + const char *shi2_passwd; +}; + +static NET_API_STATUS share_info_2_to_samba( const BYTE *buf, unsigned char **bufptr ) +{ + struct share_info_2 *ret; + SHARE_INFO_2 *info = (SHARE_INFO_2 *)buf; + DWORD len = 0; + char *ptr; + + if (info->shi2_netname) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_netname, -1, NULL, 0, NULL, NULL ); + if (info->shi2_remark) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_remark, -1, NULL, 0, NULL, NULL ); + if (info->shi2_path) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_path, -1, NULL, 0, NULL, NULL ); + if (info->shi2_passwd) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_passwd, -1, NULL, 0, NULL, NULL ); + if (!(ret = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret) + len ))) + return ERROR_OUTOFMEMORY; + + ptr = (char *)(ret + 1); + if (!info->shi2_netname) ret->shi2_netname = NULL; + else + { + ret->shi2_netname = ptr; + ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_netname, -1, ptr, len, NULL, NULL ); + } + ret->shi2_type = info->shi2_type; + if (!info->shi2_remark) ret->shi2_remark = NULL; + else + { + ret->shi2_remark = ptr; + ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_remark, -1, ptr, len, NULL, NULL ); + } + ret->shi2_permissions = info->shi2_permissions; + ret->shi2_max_uses = info->shi2_max_uses; + ret->shi2_current_uses = info->shi2_current_uses; + if (!info->shi2_path) ret->shi2_path = NULL; + else + { + ret->shi2_path = ptr; + ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_path, -1, ptr, len, NULL, NULL ); + } + if (!info->shi2_passwd) ret->shi2_passwd = NULL; + else + { + ret->shi2_passwd = ptr; + WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_passwd, -1, ptr, len, NULL, NULL ); + } + *bufptr = (unsigned char *)ret; + return NERR_Success; +} + +static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigned char **bufptr ) +{ + switch (level) + { + case 2: return share_info_2_to_samba( buf, bufptr ); + default: + FIXME( "level %u not supported\n", level ); + return ERROR_NOT_SUPPORTED; + } +} + +static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err ) +{ + char *server = NULL; + unsigned char *info; + NET_API_STATUS status; + + if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY; + status = share_info_to_samba( level, buf, &info ); + if (!status) + { + status = pNetShareAdd( server, level, info, parm_err ); + HeapFree( GetProcessHeap(), 0, info ); + } + HeapFree( GetProcessHeap(), 0, server ); + return status; +} + struct wksta_info_100 { unsigned int wki100_platform_id; @@ -287,6 +395,11 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf ERR( "\n" ); return ERROR_NOT_SUPPORTED; } +static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err ) +{ + ERR( "\n" ); + return ERROR_NOT_SUPPORTED; +} static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) { ERR( "\n" ); @@ -652,7 +765,17 @@ NET_API_STATUS WINAPI NetShareGetInfo(LMSTR servername, LMSTR netname, NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err) { - FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); + BOOL local = NETAPI_IsLocalComputer( servername ); + + TRACE("%s %d %p %p\n", debugstr_w(servername), level, buf, parm_err); + + if (!local) + { + if (libnetapi_init()) return share_add( servername, level, buf, parm_err ); + FIXME( "remote computers not supported\n" ); + } + + FIXME("%s %d %p %p\n", debugstr_w(servername), level, buf, parm_err); return ERROR_NOT_SUPPORTED; }

1 0

Hans Leidekker : netapi32: Add support for remote computers in NetShareDel.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 8f200ea9f8d237ffb33540df428cfa2e1b985dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f200ea9f8d237ffb33540df4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:36:01 2013 +0100 netapi32: Add support for remote computers in NetShareDel. --- dlls/netapi32/netapi32.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 4223379..68d8872 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -82,6 +82,7 @@ static NET_API_STATUS (*pNetApiBufferAllocate)(unsigned int, void **); static NET_API_STATUS (*pNetApiBufferFree)(void *); static NET_API_STATUS (*pNetServerGetInfo)(const char *, unsigned int, unsigned char **); static NET_API_STATUS (*pNetShareAdd)(const char *, unsigned int, unsigned char *, unsigned int *); +static NET_API_STATUS (*pNetShareDel)(const char *, const char *, unsigned int); static NET_API_STATUS (*pNetWkstaGetInfo)(const char *, unsigned int, unsigned char **); static BOOL libnetapi_init(void) @@ -113,6 +114,7 @@ static BOOL libnetapi_init(void) LOAD_FUNCPTR(NetApiBufferFree) LOAD_FUNCPTR(NetServerGetInfo) LOAD_FUNCPTR(NetShareAdd) + LOAD_FUNCPTR(NetShareDel) LOAD_FUNCPTR(NetWkstaGetInfo) #undef LOAD_FUNCPTR @@ -312,6 +314,23 @@ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDW return status; } +static NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) +{ + char *server = NULL, *share; + NET_API_STATUS status; + + if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY; + if (!(share = strdup_unixcp( netname ))) + { + HeapFree( GetProcessHeap(), 0, server ); + return ERROR_OUTOFMEMORY; + } + status = pNetShareDel( server, share, reserved ); + HeapFree( GetProcessHeap(), 0, server ); + HeapFree( GetProcessHeap(), 0, share ); + return status; +} + struct wksta_info_100 { unsigned int wki100_platform_id; @@ -400,6 +419,11 @@ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDW ERR( "\n" ); return ERROR_NOT_SUPPORTED; } +NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) +{ + ERR( "\n" ); + return ERROR_NOT_SUPPORTED; +} static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) { ERR( "\n" ); @@ -744,7 +768,17 @@ NET_API_STATUS WINAPI NetShareEnum( LMSTR servername, DWORD level, LPBYTE* bufpt */ NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserved) { - FIXME("Stub (%s %s %d)\n", debugstr_w(servername), debugstr_w(netname), reserved); + BOOL local = NETAPI_IsLocalComputer( servername ); + + TRACE("%s %s %d\n", debugstr_w(servername), debugstr_w(netname), reserved); + + if (!local) + { + if (libnetapi_init()) return share_del( servername, netname, reserved ); + FIXME( "remote computers not supported\n" ); + } + + FIXME("%s %s %d\n", debugstr_w(servername), debugstr_w(netname), reserved); return NERR_Success; }

1 0

Nikolay Sivov : oleaut32: Always set LIBFLAG_FHASDISKIMAGE when loading from file.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 7be2251cd673588814dc8b5cb7272424dfb82688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be2251cd673588814dc8b5cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 13 18:40:32 2013 +0400 oleaut32: Always set LIBFLAG_FHASDISKIMAGE when loading from file. --- dlls/oleaut32/tests/typelib.c | 33 +++++++++++++++++++++++++++++---- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9397fe3..80e3b99 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2662,8 +2662,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(libattr->syskind == sys, "syskind = %d\n", libattr->syskind); ok(libattr->wMajorVerNum == 0, "wMajorVer = %d\n", libattr->wMajorVerNum); ok(libattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", libattr->wMinorVerNum); - todo_wine - ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); + ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, libattr); hres = ITypeLib_GetDocumentation(tl, -1, &name, &docstring, &helpcontext, &helpfile); @@ -3965,7 +3964,9 @@ static void test_create_typelib_lcid(LCID lcid) HRESULT hr; ICreateTypeLib2 *tl; HANDLE file; - DWORD msft_header[7]; + DWORD msft_header[8]; + ITypeLib *typelib; + TLIBATTR *attr; DWORD read; GetTempFileNameA( ".", "tlb", 0, filename ); @@ -3974,6 +3975,14 @@ static void test_create_typelib_lcid(LCID lcid) hr = CreateTypeLib2(SYS_WIN32, name, &tl); ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeLib2_QueryInterface(tl, &IID_ITypeLib, (void**)&typelib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetLibAttr(typelib, &attr); + ok(hr == S_OK, "got %08x\n", hr); + ok(attr->wLibFlags == 0, "flags 0x%x\n", attr->wLibFlags); + ITypeLib_ReleaseTLibAttr(typelib, attr); + hr = ICreateTypeLib2_SetLcid(tl, lcid); ok(hr == S_OK, "got %08x\n", hr); @@ -3983,6 +3992,12 @@ static void test_create_typelib_lcid(LCID lcid) hr = ICreateTypeLib2_SaveAllChanges(tl); ok(hr == S_OK, "got %08x\n", hr); + hr = ITypeLib_GetLibAttr(typelib, &attr); + ok(hr == S_OK, "got %08x\n", hr); + ok(attr->wLibFlags == 0, "flags 0x%x\n", attr->wLibFlags); + ITypeLib_ReleaseTLibAttr(typelib, attr); + + ITypeLib_Release(typelib); ICreateTypeLib2_Release(tl); file = CreateFileA( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); @@ -3998,6 +4013,17 @@ static void test_create_typelib_lcid(LCID lcid) ok(msft_header[3] == (lcid ? lcid : 0x409), "got %08x (lcid %08x)\n", msft_header[3], lcid); ok(msft_header[4] == lcid, "got %08x (lcid %08x)\n", msft_header[4], lcid); ok(msft_header[6] == 0x00040003, "got %08x\n", msft_header[6]); + ok(msft_header[7] == 0, "got %08x\n", msft_header[7]); + + /* check flags after loading */ + hr = LoadTypeLib(name, &typelib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetLibAttr(typelib, &attr); + ok(hr == S_OK, "got %08x\n", hr); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "flags 0x%x\n", attr->wLibFlags); + ITypeLib_ReleaseTLibAttr(typelib, attr); + ITypeLib_Release(typelib); DeleteFileA(filename); } @@ -4770,7 +4796,6 @@ static void test_LoadRegTypeLib(void) ok(attr->lcid == 0, "got %x\n", attr->lcid); ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); -todo_wine ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, attr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07da928..0dd3f64 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3585,7 +3585,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); - pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->libflags = ((WORD) tlbHeader.flags & 0xffff) /* check mask */ | LIBFLAG_FHASDISKIMAGE; pTypeLibImpl->set_lcid = tlbHeader.lcid2; pTypeLibImpl->lcid = tlbHeader.lcid;

1 0

Jacek Caban : vbscript: Added parser support for arrays.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: cf5143554194010e46e377dbdfb817dd2ee806be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5143554194010e46e377dbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:28:55 2013 +0100 vbscript: Added parser support for arrays. --- dlls/vbscript/compile.c | 6 ++++++ dlls/vbscript/parse.h | 7 +++++++ dlls/vbscript/parser.y | 47 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c5f3797..ccf7700 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -934,6 +934,12 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) } ctx->func->var_cnt++; + + if(dim_decl->is_array) { + FIXME("arrays not supported\n"); + return E_NOTIMPL; + } + if(!dim_decl->next) break; dim_decl = dim_decl->next; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ba1a311..4b97814 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -138,8 +138,15 @@ typedef struct { expression_t *value_expr; } assign_statement_t; +typedef struct _dim_list_t { + unsigned val; + struct _dim_list_t *next; +} dim_list_t; + typedef struct _dim_decl_t { const WCHAR *name; + BOOL is_array; + dim_list_t *dims; struct _dim_decl_t *next; } dim_decl_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3c54fd8..6e1eb95 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -57,7 +57,8 @@ static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); static statement_t *new_const_statement(parser_ctx_t*,const_decl_t*); static statement_t *new_select_statement(parser_ctx_t*,expression_t*,case_clausule_t*); -static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); +static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,BOOL,dim_list_t*); +static dim_list_t *new_dim(parser_ctx_t*,unsigned,dim_list_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); @@ -91,6 +92,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; member_expression_t *member; elseif_decl_t *elseif; dim_decl_t *dim_decl; + dim_list_t *dim_list; function_decl_t *func_decl; arg_decl_t *arg_decl; class_decl_t *class_decl; @@ -132,8 +134,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf %type <class_decl> ClassDeclaration ClassBody -%type <uint> Storage Storage_opt -%type <dim_decl> DimDeclList +%type <uint> Storage Storage_opt IntegerValue +%type <dim_decl> DimDeclList DimDecl +%type <dim_list> DimList %type <const_decl> ConstDecl ConstDeclList %type <string> Identifier %type <case_clausule> CaseClausules @@ -209,9 +212,18 @@ MemberExpression : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } | CallExpression '.' Identifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } -DimDeclList /* FIXME: Support arrays */ - : Identifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } - | Identifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } +DimDeclList + : DimDecl { $$ = $1; } + | DimDecl ',' DimDeclList { $1->next = $3; $$ = $1; } + +DimDecl + : Identifier { $$ = new_dim_decl(ctx, $1, FALSE, NULL); CHECK_ERROR; } + | Identifier '(' DimList ')' { $$ = new_dim_decl(ctx, $1, TRUE, $3); CHECK_ERROR; } + | Identifier tEMPTYBRACKETS { $$ = new_dim_decl(ctx, $1, TRUE, NULL); CHECK_ERROR; } + +DimList + : IntegerValue { $$ = new_dim(ctx, $1, NULL); } + | IntegerValue ',' DimList { $$ = new_dim(ctx, $1, $3); } ConstDeclList : ConstDecl { $$ = $1; } @@ -369,6 +381,10 @@ NumericLiteralExpression | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } +IntegerValue + : tShort { $$ = $1; } + | '0' { $$ = 0; } + | tLong { $$ = $1; } PrimaryExpression : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } @@ -619,7 +635,7 @@ static statement_t *new_set_statement(parser_ctx_t *ctx, member_expression_t *le return &stat->stat; } -static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t *next) +static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_array, dim_list_t *dims) { dim_decl_t *decl; @@ -628,10 +644,25 @@ static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t return NULL; decl->name = name; - decl->next = next; + decl->is_array = is_array; + decl->dims = dims; + decl->next = NULL; return decl; } +static dim_list_t *new_dim(parser_ctx_t *ctx, unsigned val, dim_list_t *next) +{ + dim_list_t *ret; + + ret = parser_alloc(ctx, sizeof(*ret)); + if(!ret) + return NULL; + + ret->val = val; + ret->next = next; + return ret; +} + static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) { dim_statement_t *stat;

1 0

Dmitry Timoshkov : server: Make it possible for WaitCommEvent to detect recursive requests.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: a890d0f030a864d893646bd0c29dd761781bcdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a890d0f030a864d893646bd0c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 31 16:58:19 2013 +0900 server: Make it possible for WaitCommEvent to detect recursive requests. --- dlls/kernel32/tests/comm.c | 1 - dlls/ntdll/serial.c | 30 ++++++++++++++++++++++++++---- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/serial.c | 26 +++++++++++++++++++++++++- 5 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 1f88707..cbd276b 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -966,7 +966,6 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); CloseHandle(ovl_wait2.hEvent); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 04aacf0..b03ac61 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -381,7 +381,21 @@ static NTSTATUS get_timeouts(HANDLE handle, SERIAL_TIMEOUTS* st) return status; } -static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write) +static void stop_waiting( HANDLE handle ) +{ + NTSTATUS status; + + SERVER_START_REQ( set_serial_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = SERIALINFO_PENDING_WAIT; + if ((status = wine_server_call( req ))) + ERR("failed to clear waiting state: %#x\n", status); + } + SERVER_END_REQ; +} + +static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write, BOOL start_wait) { NTSTATUS status; @@ -389,6 +403,7 @@ static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD { req->handle = wine_server_obj_handle( hDevice ); req->flags = pending_write ? SERIALINFO_PENDING_WRITE : 0; + if (start_wait) req->flags |= SERIALINFO_PENDING_WAIT; if (!(status = wine_server_call( req ))) { *mask = reply->eventmask; @@ -940,7 +955,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) &new_irq_info, &commio->irq_info, new_mstat, commio->mstat, commio->pending_write); if (*commio->events) break; - get_wait_mask(commio->hDevice, &dummy, &cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL); + get_wait_mask(commio->hDevice, &dummy, &cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, FALSE); if (commio->cookie != cookie) { *commio->events = 0; @@ -959,6 +974,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) else commio->iosb->u.Status = STATUS_CANCELLED; } + stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); RtlFreeHeap(GetProcessHeap(), 0, commio); return 0; @@ -980,7 +996,12 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK commio->iosb = piosb; commio->hEvent = hEvent; commio->pending_write = 0; - get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL); + status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); + if (status) + { + RtlFreeHeap(GetProcessHeap(), 0, commio); + return status; + } /* We may never return, if some capabilities miss * Return error in that case @@ -1045,6 +1066,7 @@ error_caps: status = STATUS_INVALID_PARAMETER; #endif out_now: + stop_waiting(commio->hDevice); RtlFreeHeap(GetProcessHeap(), 0, commio); return status; } @@ -1175,7 +1197,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { - if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL))) + if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL, FALSE))) sz = sizeof(DWORD); } else diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 604affd..dc83806 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3083,6 +3083,7 @@ struct set_serial_info_reply #define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 +#define SERIALINFO_PENDING_WAIT 0x08 @@ -5845,6 +5846,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 451 +#define SERVER_PROTOCOL_VERSION 452 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 31b85f8..3c3b0b5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2239,6 +2239,7 @@ enum message_type #define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 +#define SERIALINFO_PENDING_WAIT 0x08 /* Create an async I/O */ diff --git a/server/serial.c b/server/serial.c index 25587a7..880f5e3 100644 --- a/server/serial.c +++ b/server/serial.c @@ -77,7 +77,8 @@ struct serial unsigned int eventmask; unsigned int generation; /* event mask change counter */ - unsigned int pending_write; + unsigned int pending_write : 1; + unsigned int pending_wait : 1; struct termios original; @@ -139,6 +140,7 @@ struct object *create_serial( struct fd *fd ) serial->eventmask = 0; serial->generation = 0; serial->pending_write = 0; + serial->pending_wait = 0; serial->fd = (struct fd *)grab_object( fd ); set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; @@ -205,6 +207,17 @@ DECL_HANDLER(get_serial_info) if ((serial = get_serial_obj( current->process, req->handle, 0 ))) { + if (req->flags & SERIALINFO_PENDING_WAIT) + { + if (serial->pending_wait) + { + release_object( serial ); + set_error( STATUS_INVALID_PARAMETER ); + return; + } + serial->pending_wait = 1; + } + /* timeouts */ reply->readinterval = serial->readinterval; reply->readconst = serial->readconst; @@ -231,6 +244,17 @@ DECL_HANDLER(set_serial_info) if ((serial = get_serial_obj( current->process, req->handle, 0 ))) { + if (req->flags & SERIALINFO_PENDING_WAIT) + { + if (!serial->pending_wait) + { + release_object( serial ); + set_error( STATUS_INVALID_PARAMETER ); + return; + } + serial->pending_wait = 0; + } + /* timeouts */ if (req->flags & SERIALINFO_SET_TIMEOUTS) {

1 0

André Hentschel : ntdll: Adjust NtAreMappedFilesTheSame to win8 behaviour.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 4ecc9788bd9e8a997a7f41efbe944561d37990b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecc9788bd9e8a997a7f41efb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 12 21:39:06 2013 +0100 ntdll: Adjust NtAreMappedFilesTheSame to win8 behaviour. --- dlls/kernel32/tests/virtual.c | 6 ++++-- dlls/ntdll/virtual.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a77fdb9..0d417a6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1053,10 +1053,12 @@ static void test_NtAreMappedFilesTheSame(void) CloseHandle( file2 ); status = pNtAreMappedFilesTheSame( ptr, ptr ); - ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_NOT_SAME_DEVICE), + "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( ptr, (char *)ptr + 30 ); - ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_NOT_SAME_DEVICE), + "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e438eaa..3b9cad8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2963,10 +2963,10 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) status = STATUS_INVALID_ADDRESS; else if ((view1->protect & VPROT_VALLOC) || (view2->protect & VPROT_VALLOC)) status = STATUS_CONFLICTING_ADDRESSES; - else if (!(view1->protect & VPROT_IMAGE) || !(view2->protect & VPROT_IMAGE)) - status = STATUS_NOT_SAME_DEVICE; else if (view1 == view2) status = STATUS_SUCCESS; + else if (!(view1->protect & VPROT_IMAGE) || !(view2->protect & VPROT_IMAGE)) + status = STATUS_NOT_SAME_DEVICE; else if (!stat_mapping_file( view1, &st1 ) && !stat_mapping_file( view2, &st2 ) && st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) status = STATUS_SUCCESS;

1 0