diff --git a/files/d3d9-helper.patch b/files/d3d9-helper.patch --- a/files/d3d9-helper.patch +++ b/files/d3d9-helper.patch @@ -1,6 +1,6 @@ -From 58190cd8c0e5e9cefe55f3a74c5c2fe223eea3eb Mon Sep 17 00:00:00 2001 +From 08fe179f01e25a1ca594b9719529d3d5c47cc2c4 Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sun, 2 Sep 2018 10:29:11 -0400 +Date: Sat, 13 Oct 2018 11:40:07 -0400 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie @@ -18,7 +18,7 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 26b2431047..de57f5428b 100644 +index 31168c0972..741205757a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -110,6 +110,7 @@ struct builtin_load_info @@ -29,7 +29,7 @@ NTSTATUS status; WINE_MODREF *wm; }; -@@ -135,7 +136,8 @@ static WINE_MODREF *cached_modref; +@@ -134,7 +135,8 @@ static WINE_MODREF *cached_modref; static WINE_MODREF *current_modref; static WINE_MODREF *last_failed_modref; @@ -39,7 +39,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); -@@ -511,7 +513,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS +@@ -510,7 +512,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!(wm = find_basename_module( mod_name ))) { TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); @@ -48,7 +48,7 @@ !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { if (!imports_fixup_done && current_modref) -@@ -682,7 +684,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -681,7 +683,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP { ascii_to_unicode( buffer, name, len ); buffer[len] = 0; @@ -57,7 +57,7 @@ } else /* need to allocate a larger buffer */ { -@@ -690,7 +692,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -689,7 +691,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; @@ -66,7 +66,7 @@ RtlFreeHeap( GetProcessHeap(), 0, ptr ); } -@@ -976,7 +978,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * +@@ -975,7 +977,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * prev = current_modref; current_modref = wm; @@ -75,7 +75,7 @@ current_modref = prev; if (status) { -@@ -1064,7 +1066,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) +@@ -1063,7 +1065,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) * Allocate a WINE_MODREF structure and add it to the process list * The loader_section must be locked while calling this function. */ @@ -84,7 +84,7 @@ { WINE_MODREF *wm; const WCHAR *p; -@@ -1078,7 +1080,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) +@@ -1077,7 +1079,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; @@ -93,7 +93,7 @@ if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); -@@ -1745,7 +1747,7 @@ static void load_builtin_callback( void *module, const char *filename ) +@@ -1744,7 +1746,7 @@ static void load_builtin_callback( void *module, const char *filename ) return; } @@ -102,7 +102,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1955,8 +1957,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) +@@ -1954,8 +1956,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) /****************************************************************************** * load_native_dll (internal) */ @@ -113,7 +113,7 @@ { void *module; HANDLE mapping; -@@ -1999,7 +2001,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -1998,7 +2000,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* create the MODREF */ @@ -122,7 +122,7 @@ { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_NO_MEMORY; -@@ -2067,8 +2069,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2066,8 +2068,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /*********************************************************************** * load_builtin_dll */ @@ -133,7 +133,7 @@ { char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; -@@ -2088,6 +2090,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -2087,6 +2089,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, */ info.load_path = load_path; info.filename = NULL; @@ -141,7 +141,7 @@ info.status = STATUS_SUCCESS; info.wm = NULL; -@@ -2286,6 +2289,108 @@ done: +@@ -2285,6 +2288,108 @@ done: return status; } @@ -250,7 +250,7 @@ /*********************************************************************** * open_dll_file -@@ -2332,7 +2437,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct +@@ -2331,7 +2436,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, WCHAR *filename, ULONG *size, WINE_MODREF **pwm, @@ -259,7 +259,7 @@ { UNICODE_STRING nt_name; WCHAR *file_part, *ext, *dllname; -@@ -2377,20 +2482,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, +@@ -2376,20 +2481,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { @@ -305,7 +305,7 @@ } /* not found */ -@@ -2438,8 +2564,10 @@ overflow: +@@ -2437,8 +2563,10 @@ overflow: * Load a PE style module according to the load order. * The loader_section must be locked while calling this function. */ @@ -317,7 +317,7 @@ enum loadorder loadorder; WCHAR buffer[64]; WCHAR *filename; -@@ -2456,7 +2584,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2455,7 +2583,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ size = sizeof(buffer); for (;;) { @@ -326,7 +326,7 @@ if (nts == STATUS_SUCCESS) break; if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (nts != STATUS_BUFFER_TOO_SMALL) return nts; -@@ -2476,6 +2604,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2475,6 +2603,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -352,7 +352,7 @@ loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); if (handle && is_fake_dll( handle )) -@@ -2498,22 +2645,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2497,22 +2644,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ if (!handle) nts = STATUS_DLL_NOT_FOUND; else { @@ -380,7 +380,7 @@ if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { -@@ -2523,7 +2670,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2522,7 +2669,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = STATUS_DLL_NOT_FOUND; } if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) @@ -389,7 +389,7 @@ break; } -@@ -2556,7 +2703,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2555,7 +2702,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, RtlEnterCriticalSection( &loader_section ); if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -398,7 +398,7 @@ if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { -@@ -2595,7 +2742,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S +@@ -2594,7 +2741,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S size = sizeof(buffer); for (;;) { @@ -407,7 +407,7 @@ if (handle) NtClose( handle ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (status != STATUS_BUFFER_TOO_SMALL) break; -@@ -3517,7 +3664,7 @@ void __wine_process_init(void) +@@ -3515,7 +3662,7 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -805,10 +805,10 @@ + return ret; +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 165f083425..78c6ee0710 100644 +index f4de3cf848..1e1990a0fb 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -214,6 +214,7 @@ enum loadorder +@@ -213,6 +213,7 @@ enum loadorder }; extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; @@ -1025,5 +1025,5 @@ /* @makedep: winecfg.ico */ -- -2.18.0 +2.19.1 diff --git a/files/wine-d3d9.patch b/files/wine-d3d9.patch --- a/files/wine-d3d9.patch +++ b/files/wine-d3d9.patch @@ -1,6 +1,6 @@ -From 3e70b20d568b404f09415c70375c1bcf9e633878 Mon Sep 17 00:00:00 2001 +From a859cc21e2edabdcd44482b3fc397d4b8377f236 Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sun, 2 Sep 2018 10:28:41 -0400 +Date: Sat, 13 Oct 2018 11:39:04 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie @@ -41,7 +41,7 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 39185e3dae..3dd1436868 100644 +index 7bfb2c3a5a..45c4b10aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -59,7 +59,7 @@ AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), -@@ -424,6 +432,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) +@@ -429,6 +437,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -68,7 +68,7 @@ dnl **** Check for header files **** AC_SYS_LARGEFILE() -@@ -1276,6 +1286,183 @@ OpenGL and Direct3D won't be supported.]) +@@ -1280,6 +1290,183 @@ OpenGL and Direct3D won't be supported.]) WINE_NOTICE_WITH(va,[test "x$ac_cv_lib_soname_va" = "x" -o "x$ac_cv_lib_soname_va_x11" = "x" -o "x$ac_cv_lib_soname_va_drm" = "x"], [libva ${notice_platform}development files not found, GPU video acceleration won't be supported.]) @@ -252,7 +252,7 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3260,6 +3447,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) +@@ -3266,6 +3453,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) @@ -5781,5 +5781,5 @@ + +#endif -- -2.18.0 +2.19.1 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : wine -version : 3.17 -release : 49 +version : '3.18' +release : 50 source : - - https://github.com/wine-mirror/wine/archive/wine-3.17.tar.gz : d8850c54b328541507cc67a548655fafb8f97486745d81452dbc54f36c5749c3 + - https://github.com/wine-mirror/wine/archive/wine-3.18.tar.gz : cdf695836c0dfe9069bbd2ce74fae6622aee66d493125831cdfe6a9c6d627a15 license : LGPL-2.1-or-later component : virt summary : Wine compatibility layer for Windows emulation diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2021,7 +2021,7 @@ emul32 - wine + wine /usr/bin/wine @@ -4042,8 +4042,8 @@ programming.devel - wine-32bit - wine-devel + wine-32bit + wine-devel /usr/lib32/libwine.so @@ -4056,7 +4056,7 @@ programming.devel - wine + wine /usr/include/wine/debug.h @@ -5004,12 +5004,12 @@ - - 2018-09-28 - 3.17 + + 2018-10-13 + 3.18 Packaging update Pierre-Yves pyu@riseup.net \ No newline at end of file