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

Jacek Caban : rpcrt4: Don't use GetExceptionCode outside __except block.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 7b0830c98d1af50e4a6199f83c3c412aaedccb33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b0830c98d1af50e4a6199f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:33:14 2020 +0200 rpcrt4: Don't use GetExceptionCode outside __except block. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_epmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 803c9f851b..6444f29e79 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -183,7 +183,7 @@ static RPC_STATUS get_epm_handle_server(RPC_BINDING_HANDLE *epm_handle) static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) { - switch (GetExceptionCode()) + switch (__eptr->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION:

1 0

Alexandre Julliard : configure: Check for deprecation warnings from sys/sysctl.h.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 9a37560060227c42258d81367b2c344fc79b93aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a37560060227c42258d8136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 14:53:02 2020 +0200 configure: Check for deprecation warnings from sys/sysctl.h. The warning was added in glibc 2.30. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 22 +++++++++++++++++++++- configure.ac | 12 +++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1f4080fc54..0b368610fa 100755 --- a/configure +++ b/configure @@ -7559,7 +7559,7 @@ fi -for ac_header in sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h +for ac_header in sys/mount.h sys/statfs.h sys/user.h sys/vfs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h> @@ -7577,6 +7577,26 @@ fi done +saved_sysctl_h_CFLAGS=$CFLAGS +test "x${GCC}" != xyes || CFLAGS="$CFLAGS -Werror" +for ac_header in sys/sysctl.h +do : + ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#include <sys/types.h> + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif +" +if test "x$ac_cv_header_sys_sysctl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SYSCTL_H 1 +_ACEOF + +fi + +done + +CFLAGS=$saved_sysctl_h_CFLAGS + for ac_header in \ netinet/ip.h \ net/if.h \ diff --git a/configure.ac b/configure.ac index ce2c94eca2..be3bc65175 100644 --- a/configure.ac +++ b/configure.ac @@ -547,12 +547,22 @@ AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** -AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h],,, +AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) +dnl check for broken Linux sysctl.h that causes deprecation warnings +saved_sysctl_h_CFLAGS=$CFLAGS +test "x${GCC}" != xyes || CFLAGS="$CFLAGS -Werror" +AC_CHECK_HEADERS([sys/sysctl.h],,, + [#include <sys/types.h> + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif]) +CFLAGS=$saved_sysctl_h_CFLAGS + AC_CHECK_HEADERS(\ netinet/ip.h \ net/if.h \

1 0

Henri Verbeet : wined3d: Move device_clear_render_targets() to texture.c.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: ee8e4d2010d4990cd04a7c428aefad3690a3c4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8e4d2010d4990cd04a7c42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:44 2020 +0430 wined3d: Move device_clear_render_targets() to texture.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 245 --------------------------------------- dlls/wined3d/texture.c | 254 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 - 3 files changed, 251 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8e4d2010d4990cd04a…

1 0

Henri Verbeet : wined3d: Use the view instead of the texture in is_full_clear().
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: dad42f3c8061bf9c7f938d44778783cebbe55ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad42f3c8061bf9c7f938d44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:45 2020 +0430 wined3d: Use the view instead of the texture in is_full_clear(). Using the texture is a left-over from when rendertargets were surfaces. Using the view is in fact more straightforward. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5b0b070998..70acc5b182 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5176,14 +5176,10 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 } } -static bool is_full_clear(const struct wined3d_texture *texture, unsigned int sub_resource_idx, - const RECT *draw_rect, const RECT *clear_rect) +static bool is_full_clear(const struct wined3d_rendertarget_view *rtv, const RECT *draw_rect, const RECT *clear_rect) { - unsigned int width, height, level; - - level = sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); + unsigned int height = rtv->height; + unsigned int width = rtv->width; /* partial draw rect */ if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) @@ -5256,8 +5252,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig { struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rt, rtv->sub_resource_idx, - draw_rect, rect_count ? clear_rect : NULL)) + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rtv, draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); else wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); @@ -5284,7 +5279,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) - && !is_full_clear(ds, dsv->sub_resource_idx, draw_rect, rect_count ? clear_rect : NULL)) + && !is_full_clear(dsv, draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); else wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location);

1 0

Alexandre Julliard : ntdll: Avoid using wine_dll_enum_load_path() from libwine.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: ba1495f7c2c3cff3db9ce99600bfc8ddfa365387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1495f7c2c3cff3db9ce996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:35:39 2020 +0200 ntdll: Avoid using wine_dll_enum_load_path() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 5 ++--- dlls/ntdll/loader.c | 8 +++----- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index eabebbcc28..71ae48681d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,7 +38,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" -#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -412,10 +411,10 @@ static void set_wow64_environment( WCHAR **env ) set_wine_path_variable( env, winehomedirW, home ); set_wine_path_variable( env, winebuilddirW, build_dir ); set_wine_path_variable( env, wineconfigdirW, config_dir ); - for (i = 0; (p = wine_dll_enum_load_path( i )); i++) + for (i = 0; dll_paths[i]; i++) { NTDLL_swprintf( buf, winedlldirW, i ); - set_wine_path_variable( env, buf, p ); + set_wine_path_variable( env, buf, dll_paths[i] ); } NTDLL_swprintf( buf, winedlldirW, i ); set_wine_path_variable( env, buf, NULL ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4d69e33b09..5ae6b11e00 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2715,7 +2715,6 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, struct stat *st, char **so_name ) { - const char *path; unsigned int i, pos, len, namelen, maxlen = 0; char *ptr, *file; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -2723,8 +2722,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, len = wcslen( name ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) maxlen = max( maxlen, strlen(path)+1 ); - maxlen += len + sizeof(".so"); + maxlen = max( maxlen, dll_path_maxlen ) + len + sizeof(".so"); if (!(file = RtlAllocateHeap( GetProcessHeap(), 0, maxlen ))) return STATUS_NO_MEMORY; @@ -2763,10 +2761,10 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, if (status != STATUS_DLL_NOT_FOUND) goto done; } - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + for (i = 0; dll_paths[i]; i++) { file[pos + len + 1] = 0; - ptr = prepend( file + pos, path, strlen(path) ); + ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); status = open_builtin_file( ptr, pwm, module, image_info, st, so_name ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fc12bf47ef..2e26d189a1 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -108,6 +108,8 @@ extern WCHAR **__wine_main_wargv; extern const char *build_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; +extern const char **dll_paths DECLSPEC_HIDDEN; +extern size_t dll_path_maxlen DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 429a41c397..bc25e242a7 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -116,6 +116,8 @@ static const enum cpu_type client_cpu = CPU_ARM64; const char *build_dir = NULL; const char *data_dir = NULL; const char *config_dir = NULL; +const char **dll_paths = NULL; +size_t dll_path_maxlen = 0; static const char *server_dir; static const char *bin_dir; @@ -1311,6 +1313,36 @@ static const char *init_config_dir(void) } +/*********************************************************************** + * build_dll_path + */ +static void build_dll_path( const char *dll_dir ) +{ + const char *default_dlldir = DLLDIR; + char *p, *path = getenv( "WINEDLLPATH" ); + int i, count = 0; + + if (path) for (p = path, count = 1; *p; p++) if (*p == ':') count++; + + dll_paths = malloc( (count + 2) * sizeof(*dll_paths) ); + count = 0; + + if (!build_dir && dll_dir) dll_paths[count++] = dll_dir; + + if (path) + { + path = strdup(path); + for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" )) dll_paths[count++] = strdup( p ); + free( path ); + } + + if (!build_dir && !dll_dir) dll_paths[count++] = default_dlldir; + + for (i = 0; i < count; i++) dll_path_maxlen = max( dll_path_maxlen, strlen(dll_paths[i]) ); + dll_paths[count] = NULL; +} + + /*********************************************************************** * init_paths */ @@ -1343,6 +1375,7 @@ void init_paths(void) data_dir = build_path( bin_dir, BIN_TO_DATADIR ); } + build_dll_path( dll_dir ); config_dir = init_config_dir(); }

1 0

Serge Gautherie : rpcrt4: Remove inexistent CreateServerInterfaceFromStub().
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 98eaef3ad945eae570f92184725115613f6a3951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98eaef3ad945eae570f92184… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Apr 27 04:00:29 2020 +0200 rpcrt4: Remove inexistent CreateServerInterfaceFromStub(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 04927764ef..135beab0ff 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -9,7 +9,6 @@ @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stub CreateServerInterfaceFromStub # wxp @ stdcall DceErrorInqTextA (long ptr) @ stdcall DceErrorInqTextW (long ptr) @ stdcall -private DllRegisterServer()

1 0

Jacek Caban : msvcp60: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 4e44edd209ef81a584d2d125d41b18e23141d200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e44edd209ef81a584d2d125… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:44 2020 +0200 msvcp60: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 450fd80133..d2bd9864d0 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Alexandre Julliard : libwine: Make the various directory functions obsolete.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 98682cfd01aca9be2755e4279db87d54e3642f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98682cfd01aca9be2755e427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:36:15 2020 +0200 libwine: Make the various directory functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/library.h | 6 -- libs/wine/config.c | 249 ++++++++++++++++++++++++++----------------------- libs/wine/loader.c | 11 ++- libs/wine/wine.map | 12 +-- 4 files changed, 142 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98682cfd01aca9be2755…

1 0

Henri Verbeet : wined3d: Do not flush read-only mappings in wined3d_texture_vk_download_data().
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: cd94aa8fa883d9702e3a5dfbed790b15a678c7eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd94aa8fa883d9702e3a5dfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:43 2020 +0430 wined3d: Do not flush read-only mappings in wined3d_texture_vk_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e6452a09d..7ede5dea9d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4645,7 +4645,6 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, VkCommandBuffer vk_command_buffer; struct wined3d_bo_vk staging_bo; VkImageAspectFlags aspect_mask; - struct wined3d_range range; VkBufferImageCopy region; void *map_ptr; @@ -4776,9 +4775,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, dst_bo_addr->addr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, src_box->bottom - src_box->top, src_box->back - src_box->front); - range.offset = 0; - range.size = sub_resource->size; - wined3d_context_unmap_bo_address(context, &staging_bo_addr, 1, &range); + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, NULL); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); }

1 0

Jacek Caban : riched20/tests: Don't use thiscall wrappers on clang MSVC target.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 270599cc816cb590274cba2d4a6e5432ccdc9bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=270599cc816cb590274cba2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:31:25 2020 +0200 riched20/tests: Don't use thiscall wrappers on clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 487b9a02f0..1528bef523 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -48,7 +48,7 @@ static PCreateTextServices pCreateTextServices; /* Use a special table for x86 machines to convert the thiscall * calling convention. This isn't needed on other platforms. */ -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) static ITextServicesVtbl itextServicesStdcallVtbl; #define TXTSERV_VTABLE(This) (&itextServicesStdcallVtbl) #else /* __i386__ */ @@ -492,7 +492,7 @@ typedef struct static void setup_thiscall_wrappers(void) { -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) void** pVtable; void** pVtableEnd; THISCALL_TO_STDCALL_THUNK *thunk;

1 0