April 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Add check for dlinfo().
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 3154cda6bda9f8b43ea17304caecc5ecf46d8793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3154cda6bda9f8b43ea17304… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:22:10 2020 +0200 configure: Add check for dlinfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 +++++---- configure.ac | 2 +- include/config.h.in | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b41f1c797f..87cd2906e6 100755 --- a/configure +++ b/configure @@ -17864,12 +17864,13 @@ fi ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" -for ac_func in dladdr +for ac_func in dladdr dlinfo do : - ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr" -if test "x$ac_cv_func_dladdr" = xyes; then : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_DLADDR 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi diff --git a/configure.ac b/configure.ac index 241ea82d83..d5c67e3879 100644 --- a/configure.ac +++ b/configure.ac @@ -2182,7 +2182,7 @@ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) -WINE_CHECK_LIB_FUNCS(dladdr,[$DL_LIBS]) +WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) dnl Check for -lpoll for Mac OS X/Darwin if test "$ac_cv_func_poll" = no diff --git a/include/config.h.in b/include/config.h.in index 8cbf8db09a..24a037a50e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,6 +110,9 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the `dlinfo' function. */ +#undef HAVE_DLINFO + /* Define to 1 if you have the <EGL/egl.h> header file. */ #undef HAVE_EGL_EGL_H

1 0

Alexandre Julliard : ntdll: Execute .so constructors during module initialization.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 081c8e1c73bb8d79a060da7816b5c429180b35b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081c8e1c73bb8d79a060da78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:22:24 2020 +0200 ntdll: Execute .so constructors during module initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c32292d453..0568be63ad 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -24,6 +24,9 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_LINK_H +# include <link.h> +#endif #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif @@ -1306,6 +1309,42 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } +/************************************************************************* + * call_constructors + */ +static void call_constructors( WINE_MODREF *wm ) +{ +#ifdef HAVE_DLINFO + extern char **__wine_main_environ; + struct link_map *map; + void (*init_func)(int, char **, char **) = NULL; + void (**init_array)(int, char **, char **) = NULL; + ULONG_PTR i, init_arraysz = 0; + + if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; + while (map->l_ld->d_tag) + { + switch (map->l_ld->d_tag) + { + case 0x60009990: init_array = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + case 0x60009991: init_arraysz = map->l_ld->d_un.d_val; break; + case 0x60009992: init_func = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + } + map->l_ld++; + } + + TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ), + init_func, init_array, init_arraysz ); + + if (init_func) init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + + if (init_array) + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) + init_array[i]( __wine_main_argc, __wine_main_argv, __wine_main_environ ); +#endif +} + + /************************************************************************* * MODULE_InitDLL */ @@ -1321,6 +1360,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); + if (wm->so_handle && reason == DLL_PROCESS_ATTACH) call_constructors( wm ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) @@ -3979,6 +4019,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } attach_implicitly_loaded_dlls( context ); virtual_release_address_space(); + if (wm->so_handle) call_constructors( wm ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); } else

1 0

Alexandre Julliard : ntdll: Export Unix user name in WINEUSERNAME variable.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 52bf0fbd4792130af8a847856b264b99e7177d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bf0fbd4792130af8a84785… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 15:15:07 2020 +0200 ntdll: Export Unix user name in WINEUSERNAME variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index b37649764c..b15a425556 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -377,15 +377,16 @@ static void set_wow64_environment( WCHAR **env ) static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR wineusernameW[] = {'W','I','N','E','U','S','E','R','N','A','M','E',0}; static const WCHAR wineconfigdirW[] = {'W','I','N','E','C','O','N','F','I','G','D','I','R',0}; - WCHAR buf[64]; + WCHAR buf[256]; UNICODE_STRING arch_strW = { sizeof(archW) - sizeof(WCHAR), sizeof(archW), archW }; UNICODE_STRING arch6432_strW = { sizeof(arch6432W) - sizeof(WCHAR), sizeof(arch6432W), arch6432W }; UNICODE_STRING valW = { 0, sizeof(buf), buf }; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - const char *path; + const char *p, *name; WCHAR *val; HANDLE hkey; DWORD i; @@ -396,14 +397,22 @@ static void set_wow64_environment( WCHAR **env ) set_wine_path_variable( env, winehomedirW, getenv("HOME") ); set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); set_wine_path_variable( env, wineconfigdirW, wine_get_config_dir() ); - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + for (i = 0; (p = wine_dll_enum_load_path( i )); i++) { NTDLL_swprintf( buf, winedlldirW, i ); - set_wine_path_variable( env, buf, path ); + set_wine_path_variable( env, buf, p ); } NTDLL_swprintf( buf, winedlldirW, i ); set_wine_path_variable( env, buf, NULL ); + /* set user name */ + + name = wine_get_user_name(); + if ((p = strrchr( name, '/' ))) name = p + 1; + if ((p = strrchr( name, '\\' ))) name = p + 1; + ntdll_umbstowcs( name, strlen(name) + 1, buf, ARRAY_SIZE(buf) ); + set_env_var( env, wineusernameW, buf ); + /* set the PROCESSOR_ARCHITECTURE variable */ if (!RtlQueryEnvironmentVariable_U( *env, &arch6432_strW, &valW ))

1 0

Alexandre Julliard : advapi32: Use WINEUSERNAME variable to implement GetUserNameA/W.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: f8fb43aaba499c6d0da05b0ee3a09c349a753cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8fb43aaba499c6d0da05b0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 15:15:21 2020 +0200 advapi32: Use WINEUSERNAME variable to implement GetUserNameA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 79 +++++++++----------------------------------------- 1 file changed, 14 insertions(+), 65 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 433c25820d..cfd79e02af 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -32,7 +32,6 @@ #include "wincred.h" #include "wct.h" -#include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -42,81 +41,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** * GetUserNameA [ADVAPI32.@] - * - * Get the current user name. - * - * PARAMS - * lpszName [O] Destination for the user name. - * lpSize [I/O] Size of lpszName. - * - * RETURNS - * Success: The length of the user name, including terminating NUL. - * Failure: ERROR_MORE_DATA if *lpSize is too small. */ -BOOL WINAPI -GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) +BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size ) { - WCHAR *buffer; + DWORD len = GetEnvironmentVariableA( "WINEUSERNAME", name, *size ); BOOL ret; - DWORD sizeW = *lpSize; - - if (!(buffer = heap_alloc( sizeW * sizeof(WCHAR) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - ret = GetUserNameW( buffer, &sizeW ); - if (ret) - *lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); - else - *lpSize = sizeW; - - heap_free( buffer ); + if (!len) return FALSE; + if ((ret = (len < *size))) len++; + *size = len; return ret; } /****************************************************************************** * GetUserNameW [ADVAPI32.@] - * - * See GetUserNameA. */ -BOOL WINAPI -GetUserNameW( LPWSTR lpszName, LPDWORD lpSize ) +BOOL WINAPI GetUserNameW( LPWSTR name, LPDWORD size ) { - const char *name = wine_get_user_name(); - DWORD i, len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); - LPWSTR backslash; - - if (len > *lpSize) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - *lpSize = len; - return FALSE; - } - - *lpSize = len; - MultiByteToWideChar( CP_UNIXCP, 0, name, -1, lpszName, len ); - - /* Word uses the user name to create named mutexes and file mappings, - * and backslashes in the name cause the creation to fail. - * Also, Windows doesn't return the domain name in the user name even when - * joined to a domain. A Unix box joined to a domain using winbindd will - * contain the domain name in the username. So we need to cut this off. - * FIXME: Only replaces forward and backslashes for now, should get the - * winbind separator char from winbindd and replace that. - */ - for (i = 0; lpszName[i]; i++) - if (lpszName[i] == '/') lpszName[i] = '\\'; - - backslash = strrchrW(lpszName, '\\'); - if (backslash == NULL) - return TRUE; - - len = lstrlenW(backslash); - memmove(lpszName, backslash + 1, len * sizeof(WCHAR)); - *lpSize = len; - return TRUE; + static const WCHAR wineusernameW[] = {'W','I','N','E','U','S','E','R','N','A','M','E',0}; + DWORD len = GetEnvironmentVariableW( wineusernameW, name, *size ); + BOOL ret; + + if (!len) return FALSE; + if ((ret = (len < *size))) len++; + *size = len; + return ret; } /******************************************************************************

1 0

Alexandre Julliard : kernel32: Move GetNamedPipeHandleStateW() implementation to kernelbase.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 99027aeaee22b72e5cbd62f83d26f2b2d973dd57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99027aeaee22b72e5cbd62f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 15:34:59 2020 +0200 kernel32: Move GetNamedPipeHandleStateW() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/sync.c | 60 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/sync.c | 38 ++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 63 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a5550dd359..01bfdd37f1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -731,8 +731,8 @@ # @ stub GetNamedPipeClientComputerNameW @ stdcall GetNamedPipeClientProcessId(long ptr) @ stdcall GetNamedPipeClientSessionId(long ptr) -@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) -@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) +@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr ptr long) +@ stdcall -import GetNamedPipeHandleStateW(long ptr ptr ptr ptr ptr long) @ stdcall -import GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNamedPipeServerProcessId(long ptr) @ stdcall GetNamedPipeServerSessionId(long ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 48f9fca20a..7a7a37b4a2 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -42,7 +42,6 @@ #include "ddk/wdm.h" #include "wine/asm.h" -#include "wine/library.h" #include "wine/unicode.h" #include "kernel_private.h" @@ -630,65 +629,6 @@ BOOL WINAPI GetNamedPipeHandleStateA( return ret; } -/*********************************************************************** - * GetNamedPipeHandleStateW (KERNEL32.@) - */ -BOOL WINAPI GetNamedPipeHandleStateW( - HANDLE hNamedPipe, LPDWORD lpState, LPDWORD lpCurInstances, - LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout, - LPWSTR lpUsername, DWORD nUsernameMaxSize) -{ - IO_STATUS_BLOCK iosb; - NTSTATUS status; - - FIXME("%p %p %p %p %p %p %d: semi-stub\n", hNamedPipe, lpState, lpCurInstances, - lpMaxCollectionCount, lpCollectDataTimeout, lpUsername, nUsernameMaxSize); - - if (lpMaxCollectionCount) - *lpMaxCollectionCount = 0; - - if (lpCollectDataTimeout) - *lpCollectDataTimeout = 0; - - if (lpUsername && nUsernameMaxSize) - { - const char *username = wine_get_user_name(); - int len = MultiByteToWideChar(CP_UNIXCP, 0, username, -1, lpUsername, nUsernameMaxSize); - if (!len) *lpUsername = 0; - } - - if (lpState) - { - FILE_PIPE_INFORMATION fpi; - status = NtQueryInformationFile(hNamedPipe, &iosb, &fpi, sizeof(fpi), - FilePipeInformation); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - *lpState = (fpi.ReadMode ? PIPE_READMODE_MESSAGE : PIPE_READMODE_BYTE) | - (fpi.CompletionMode ? PIPE_NOWAIT : PIPE_WAIT); - } - - if (lpCurInstances) - { - FILE_PIPE_LOCAL_INFORMATION fpli; - status = NtQueryInformationFile(hNamedPipe, &iosb, &fpli, sizeof(fpli), - FilePipeLocalInformation); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - *lpCurInstances = fpli.CurrentInstances; - } - - return TRUE; -} - /*********************************************************************** * CallNamedPipeA (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9aa0613ea5..631e5c02c7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -570,7 +570,7 @@ @ stub GetNamedLocaleHashNode @ stub GetNamedPipeAttribute @ stub GetNamedPipeClientComputerNameW -@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) kernel32.GetNamedPipeHandleStateW +@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr ptr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNativeSystemInfo(ptr) # @ stub GetNextFgPolicyRefreshInfoInternal diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 441b47ffb0..c0db4679e9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1201,6 +1201,44 @@ BOOL WINAPI DECLSPEC_HOTPATCH DisconnectNamedPipe( HANDLE pipe ) } +/*********************************************************************** + * GetNamedPipeHandleStateW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetNamedPipeHandleStateW( HANDLE pipe, DWORD *state, DWORD *instances, + DWORD *max_count, DWORD *timeout, + WCHAR *user, DWORD size ) +{ + IO_STATUS_BLOCK io; + + FIXME( "%p %p %p %p %p %p %d: semi-stub\n", pipe, state, instances, max_count, timeout, user, size ); + + if (max_count) *max_count = 0; + if (timeout) *timeout = 0; + if (user && size && !GetEnvironmentVariableW( L"WINEUSERNAME", user, size )) user[0] = 0; + + if (state) + { + FILE_PIPE_INFORMATION info; + + if (!set_ntstatus( NtQueryInformationFile( pipe, &io, &info, sizeof(info), FilePipeInformation ))) + return FALSE; + + *state = (info.ReadMode ? PIPE_READMODE_MESSAGE : PIPE_READMODE_BYTE) | + (info.CompletionMode ? PIPE_NOWAIT : PIPE_WAIT); + } + if (instances) + { + FILE_PIPE_LOCAL_INFORMATION info; + + if (!set_ntstatus( NtQueryInformationFile( pipe, &io, &info, sizeof(info), + FilePipeLocalInformation))) + return FALSE; + *instances = info.CurrentInstances; + } + return TRUE; +} + + /*********************************************************************** * GetNamedPipeInfo (kernelbase.@) */

1 0

Jeff Smith : gdiplus: Reuse point when calling GdipAddPathBezier on open figure.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 1a3a8a00165b0debdcb458b3680de61163a71a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3a8a00165b0debdcb458b3… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:07 2020 -0500 gdiplus: Reuse point when calling GdipAddPathBezier on open figure. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 80 +++++++++++++++++++++++++++------------ dlls/gdiplus/tests/graphicspath.c | 34 +++++++++++++++++ 2 files changed, 90 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4d5a73588f..547f172d98 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -166,6 +166,52 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R return TRUE; } +/* GdipAddPath* helper + * + * Several GdipAddPath functions are expected to add onto an open figure. + * So if the first point being added is an exact match to the last point + * of the existing line, that point should not be added. + * + * Parameters: + * path : path to which points should be added + * points : array of points to add + * count : number of points to add (at least 1) + * type : type of the points being added + * + * Return value: + * OutOfMemory : out of memory, could not lengthen path + * Ok : success + */ +static GpStatus extend_current_figure(GpPath *path, GDIPCONST PointF *points, INT count, BYTE type) +{ + INT insert_index = path->pathdata.Count; + BYTE first_point_type = (path->newfigure ? PathPointTypeStart : PathPointTypeLine); + + if(!path->newfigure && + path->pathdata.Points[insert_index-1].X == points[0].X && + path->pathdata.Points[insert_index-1].Y == points[0].Y) + { + points++; + count--; + first_point_type = type; + } + + if(!count) + return Ok; + + if(!lengthen_path(path, count)) + return OutOfMemory; + + memcpy(path->pathdata.Points + insert_index, points, sizeof(GpPointF)*count); + path->pathdata.Types[insert_index] = first_point_type; + memset(path->pathdata.Types + insert_index + 1, type, count - 1); + + path->newfigure = FALSE; + path->pathdata.Count += count; + + return Ok; +} + /******************************************************************************* * GdipAddPathArc [GDIPLUS.1] * @@ -243,7 +289,7 @@ GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - INT old_count; + PointF points[4]; TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2, x3, y3, x4, y4); @@ -251,30 +297,16 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, if(!path) return InvalidParameter; - if(!lengthen_path(path, 4)) - return OutOfMemory; - - old_count = path->pathdata.Count; + points[0].X = x1; + points[0].Y = y1; + points[1].X = x2; + points[1].Y = y2; + points[2].X = x3; + points[2].Y = y3; + points[3].X = x4; + points[3].Y = y4; - path->pathdata.Points[old_count].X = x1; - path->pathdata.Points[old_count].Y = y1; - path->pathdata.Points[old_count + 1].X = x2; - path->pathdata.Points[old_count + 1].Y = y2; - path->pathdata.Points[old_count + 2].X = x3; - path->pathdata.Points[old_count + 2].Y = y3; - path->pathdata.Points[old_count + 3].X = x4; - path->pathdata.Points[old_count + 3].Y = y4; - - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); - path->pathdata.Types[old_count + 1] = PathPointTypeBezier; - path->pathdata.Types[old_count + 2] = PathPointTypeBezier; - path->pathdata.Types[old_count + 3] = PathPointTypeBezier; - - path->newfigure = FALSE; - path->pathdata.Count += 4; - - return Ok; + return extend_current_figure(path, points, 4, PathPointTypeBezier); } GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7670a6c41f..d85cf68dfc 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -332,6 +332,39 @@ static void test_line2(void) GdipDeletePath(path); } +static path_test_t bezier_path[] = { + {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ + {20.0, 10.0, PathPointTypeBezier, 0, 0}, /*1*/ + {20.0, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ + {30.0, 20.0, PathPointTypeBezier, 0, 0}, /*3*/ + {40.0, 20.0, PathPointTypeBezier, 0, 0}, /*4*/ + {40.0, 30.0, PathPointTypeBezier, 0, 0}, /*5*/ + {50.0, 30.0, PathPointTypeBezier, 0, 0}, /*6*/ + {50.0, 10.0, PathPointTypeLine, 0, 0}, /*7*/ + {60.0, 10.0, PathPointTypeBezier, 0, 0}, /*8*/ + {60.0, 20.0, PathPointTypeBezier, 0, 0}, /*9*/ + {70.0, 20.0, PathPointTypeBezier, 0, 0} /*10*/ + }; + +static void test_bezier(void) +{ + GpStatus status; + GpPath* path; + + GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathBezier(path, 10.0, 10.0, 20.0, 10.0, 20.0, 20.0, 30.0, 20.0); + expect(Ok, status); + status = GdipAddPathBezier(path, 30.0, 20.0, 40.0, 20.0, 40.0, 30.0, 50.0, 30.0); + expect(Ok, status); + status = GdipAddPathBezier(path, 50.0, 10.0, 60.0, 10.0, 60.0, 20.0, 70.0, 20.0); + expect(Ok, status); + + ok_path(path, bezier_path, ARRAY_SIZE(bezier_path), FALSE); + + GdipDeletePath(path); +} + static path_test_t arc_path[] = { {600.0, 450.0, PathPointTypeStart, 0, 0}, /*0*/ {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*1*/ @@ -1784,6 +1817,7 @@ START_TEST(graphicspath) test_getpathdata(); test_createpath2(); test_line2(); + test_bezier(); test_arc(); test_worldbounds(); test_pathpath();

1 0

Jacek Caban : kernelbase: Implement CreateThreadpoolIo.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: b66e13ef249065abf693500faa77d0161bc92a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66e13ef249065abf693500f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 02:00:18 2020 +0200 kernelbase: Implement CreateThreadpoolIo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 15 ++++++++++++--- dlls/ntdll/tests/threadpool.c | 4 +--- dlls/ntdll/threadpool.c | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 94ea9c49de..99f64e072b 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1187,14 +1187,23 @@ PTP_CLEANUP_GROUP WINAPI DECLSPEC_HOTPATCH CreateThreadpoolCleanupGroup(void) } +static void WINAPI tp_io_callback( TP_CALLBACK_INSTANCE *instance, void *userdata, void *cvalue, IO_STATUS_BLOCK *iosb, TP_IO *io ) +{ + PTP_WIN32_IO_CALLBACK callback = *(void **)io; + callback( instance, userdata, cvalue, RtlNtStatusToDosError( iosb->u.Status ), iosb->Information, io ); +} + + /*********************************************************************** * CreateThreadpoolIo (kernelbase.@) */ -PTP_IO WINAPI /* DECLSPEC_HOTPATCH */ CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, +PTP_IO WINAPI DECLSPEC_HOTPATCH CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, PVOID userdata, TP_CALLBACK_ENVIRON *environment ) { - FIXME( "(%p, %p, %p, %p): stub\n", handle, callback, userdata, environment ); - return FALSE; + TP_IO *io; + if (!set_ntstatus( TpAllocIoCompletion( &io, handle, tp_io_callback, userdata, environment ))) return NULL; + *(void **)io = callback; /* ntdll leaves us space to store our callback at the beginning of TP_IO struct */ + return io; } diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 2984983a06..24f32346fb 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -2130,9 +2130,7 @@ static void test_kernel32_tp_io(void) environment.Pool = pool; io = NULL; io = pCreateThreadpoolIo(server, kernel32_io_cb, &userdata, &environment); - todo_wine ok(!!io, "expected non-NULL TP_IO\n"); - if (!io) - return; + ok(!!io, "expected non-NULL TP_IO\n"); pWaitForThreadpoolIoCallbacks(io, FALSE); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 215a5e9c53..87bfdb0751 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -153,6 +153,7 @@ struct io_completion /* internal threadpool object representation */ struct threadpool_object { + void *win32_callback; /* leave space for kernelbase to store win32 callback */ LONG refcount; BOOL shutdown; /* read-only information */

1 0

Alexandre Julliard : msvcrt: Build the CRT startup code also for non-PE builds.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: a2e1e499ade0c99ece2a7e4b9b28e4ca6c24ae22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e1e499ade0c99ece2a7e4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 16:27:55 2020 +0200 msvcrt: Build the CRT startup code also for non-PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 9 +++------ dlls/msvcrt/crt_winmain.c | 4 ---- dlls/msvcrt/crt_wmain.c | 9 +++------ dlls/msvcrt/crt_wwinmain.c | 4 ---- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index fa325d64b3..8e4a00bac7 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #if _MSVCR_VER >= 140 #define _UCRT #endif @@ -34,13 +32,14 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" int __cdecl main(int argc, char **argv, char **env); static const IMAGE_NT_HEADERS *get_nt_header( void ) { - extern IMAGE_DOS_HEADER __ImageBase; - return (const IMAGE_NT_HEADERS *)((char *)&__ImageBase + __ImageBase.e_lfanew); + IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)NtCurrentTeb()->Peb->ImageBaseAddress; + return (const IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); } int __cdecl mainCRTStartup(void) @@ -65,5 +64,3 @@ int __cdecl mainCRTStartup(void) exit(ret); return ret; } - -#endif diff --git a/dlls/msvcrt/crt_winmain.c b/dlls/msvcrt/crt_winmain.c index 27e0283cbf..fda3d12f68 100644 --- a/dlls/msvcrt/crt_winmain.c +++ b/dlls/msvcrt/crt_winmain.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -54,5 +52,3 @@ int __cdecl main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } - -#endif diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 6bc20e2e0f..6a51a1741b 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #if _MSVCR_VER >= 140 #define _UCRT #endif @@ -34,13 +32,14 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" int __cdecl wmain(int argc, WCHAR **argv, WCHAR **env); static const IMAGE_NT_HEADERS *get_nt_header( void ) { - extern IMAGE_DOS_HEADER __ImageBase; - return (const IMAGE_NT_HEADERS *)((char *)&__ImageBase + __ImageBase.e_lfanew); + IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)NtCurrentTeb()->Peb->ImageBaseAddress; + return (const IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); } int __cdecl wmainCRTStartup(void) @@ -65,5 +64,3 @@ int __cdecl wmainCRTStartup(void) exit(ret); return ret; } - -#endif diff --git a/dlls/msvcrt/crt_wwinmain.c b/dlls/msvcrt/crt_wwinmain.c index 2c53b744b5..b50f728025 100644 --- a/dlls/msvcrt/crt_wwinmain.c +++ b/dlls/msvcrt/crt_wwinmain.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -56,5 +54,3 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } - -#endif

1 0

Alexandre Julliard : winegcc: Use the CRT startup code also for non-PE builds.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: 3622b9ab153ce792aa3add8d3aa71b487edfda9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3622b9ab153ce792aa3add8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 16:06:22 2020 +0200 winegcc: Use the CRT startup code also for non-PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d663103186..7d55e19866 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1187,19 +1187,16 @@ static void build(struct options* opts) /* set default entry point, if needed */ if (!opts->entry_point) { - if (is_pe) + if (opts->subsystem && !strcmp( opts->subsystem, "native" )) + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_DriverEntry(a)8" : "DriverEntry"; + else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) { - if (opts->subsystem && !strcmp( opts->subsystem, "native" )) - entry_point = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; - else if(opts->use_msvcrt && !opts->shared && !opts->win16_app) - { - if (opts->unicode_app) - entry_point = opts->target_cpu == CPU_x86 ? "_wmainCRTStartup" : "wmainCRTStartup"; - else - entry_point = opts->target_cpu == CPU_x86 ? "_mainCRTStartup" : "mainCRTStartup"; - } + if (opts->unicode_app) + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_wmainCRTStartup" : "wmainCRTStartup"; + else + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_mainCRTStartup" : "mainCRTStartup"; } - else if (!opts->shared && opts->unicode_app) + else if (!is_pe && !opts->shared && opts->unicode_app) entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point;

1 0

Alexandre Julliard : ntdll: Support loading builtin modules that don't use a constructor.
by Alexandre Julliard 15 Apr '20

15 Apr '20

Module: wine Branch: master Commit: 6ac357667ee3f4739fff45d03f88e1bc19bd079a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac357667ee3f4739fff45d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 19:37:44 2020 +0200 ntdll: Support loading builtin modules that don't use a constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9329dd2a9b..1e50e2b663 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1780,6 +1780,7 @@ static void load_builtin_callback( void *module, const char *filename ) if (!module) { ERR("could not map image for %s\n", debugstr_us(builtin_load_info->filename) ); + builtin_load_info->status = STATUS_NO_MEMORY; return; } if (!(nt = RtlImageNtHeader( module ))) @@ -2555,6 +2556,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, static const WCHAR soW[] = {'.','s','o',0}; DWORD len; void *handle; + const IMAGE_NT_HEADERS *nt; struct builtin_load_info info, *prev_info; ANSI_STRING unix_name; UNICODE_STRING win_name = *nt_name; @@ -2581,7 +2583,6 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, prev_info = builtin_load_info; builtin_load_info = &info; handle = dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW ); - builtin_load_info = prev_info; RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer ); if (!handle) @@ -2589,15 +2590,39 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (so_name) { ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() ); - return STATUS_PROCEDURE_NOT_FOUND; + info.status = STATUS_PROCEDURE_NOT_FOUND; + } + else + { + WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() ); + info.status = STATUS_INVALID_IMAGE_FORMAT; } - WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() ); - return STATUS_INVALID_IMAGE_FORMAT; } if (info.status != STATUS_SUCCESS) goto failed; - if (!info.wm) + if (!info.wm && (nt = dlsym( handle, "__wine_spec_nt_header" ))) + { + HMODULE module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); + if ((info.wm = get_modref( module ))) /* already loaded */ + { + TRACE( "Found %s at %p for builtin %s\n", + debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, + debugstr_us(nt_name) ); + if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; + dlclose( handle ); + } + else + { + __wine_dll_register( nt, NULL ); + if (!info.wm) goto failed; + TRACE_(loaddll)( "Loaded %s at %p: builtin\n", + debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); + info.wm->ldr.LoadCount = 1; + info.wm->ldr.SectionHandle = handle; + } + } + else if (!info.wm) { /* The constructor wasn't called, this means the .so is already * loaded under a different name. Try to find the wm for it. */ @@ -2620,11 +2645,13 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, info.wm->ldr.SectionHandle = handle; } + builtin_load_info = prev_info; *pwm = info.wm; return STATUS_SUCCESS; failed: - dlclose( handle ); + builtin_load_info = prev_info; + if (handle) dlclose( handle ); return info.status; }

1 0