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 08fe179f01e25a1ca594b9719529d3d5c47cc2c4 Mon Sep 17 00:00:00 2001 +From d92cc4cc1ae0279ed677a93f975df0bb9ec5af1c Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sat, 13 Oct 2018 11:40:07 -0400 +Date: Sun, 4 Nov 2018 15:48:20 -0500 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 31168c0972..741205757a 100644 +index c5e8d0d7c1..4aa342ac74 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -110,6 +110,7 @@ struct builtin_load_info @@ -102,7 +102,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1954,8 +1956,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) +@@ -1999,8 +2001,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; -@@ -1998,7 +2000,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2043,7 +2045,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; -@@ -2066,8 +2068,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2111,8 +2113,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; -@@ -2087,6 +2089,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -2132,6 +2134,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; -@@ -2285,6 +2288,108 @@ done: +@@ -2330,6 +2333,108 @@ done: return status; } @@ -250,7 +250,7 @@ /*********************************************************************** * open_dll_file -@@ -2331,7 +2436,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct +@@ -2376,7 +2481,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; -@@ -2376,20 +2481,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, +@@ -2421,20 +2526,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 */ -@@ -2437,8 +2563,10 @@ overflow: +@@ -2482,8 +2608,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; -@@ -2455,7 +2583,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2500,7 +2628,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; -@@ -2475,6 +2603,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2520,6 +2648,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 )) -@@ -2497,22 +2644,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2542,22 +2689,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)) { -@@ -2522,7 +2669,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2567,7 +2714,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; } -@@ -2555,7 +2702,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2600,7 +2747,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)) { -@@ -2594,7 +2741,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S +@@ -2639,7 +2786,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; -@@ -3515,7 +3662,7 @@ void __wine_process_init(void) +@@ -3560,7 +3707,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 f4de3cf848..1e1990a0fb 100644 +index fdb443b45c..4edd453c52 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -213,6 +213,7 @@ enum loadorder +@@ -215,6 +215,7 @@ enum loadorder }; extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; 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 a859cc21e2edabdcd44482b3fc397d4b8377f236 Mon Sep 17 00:00:00 2001 +From 03e9a3b0adc30c2aae322dc768ff4b5358ce8107 Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sat, 13 Oct 2018 11:39:04 -0400 +Date: Sun, 4 Nov 2018 15:47:32 -0500 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : wine -version : 3.19 -release : 52 +version : '3.20' +release : 53 source : - - https://dl.winehq.org/wine/source/3.x/wine-3.19.tar.xz : ef21c626aef09715de9640a79d42e8b5e305761d5f21491fe84d74cafa7a9c6a + - https://dl.winehq.org/wine/source/3.x/wine-3.20.tar.xz : 33d61122085056e091042df7d2cbe908ffb9c06e602278611dca2eea6a566f18 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 @@ -135,6 +135,7 @@ /usr/lib64/wine/api-ms-win-core-processthreads-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-processthreads-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-processthreads-l1-1-2.dll.so + /usr/lib64/wine/api-ms-win-core-processthreads-l1-1-3.dll.so /usr/lib64/wine/api-ms-win-core-processtopology-obsolete-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-profile-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-psapi-ansi-l1-1-0.dll.so @@ -184,6 +185,7 @@ /usr/lib64/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-core-winrt-string-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-wow64-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-wow64-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-xstate-l1-1-0.dll.so @@ -229,6 +231,7 @@ /usr/lib64/wine/api-ms-win-mm-time-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-ntuser-rectangle-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-ntuser-sysparams-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-perf-legacy-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-power-base-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -554,6 +557,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-processthreads-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-processthreads-l1-1-2.dll + /usr/lib64/wine/fakedlls/api-ms-win-core-processthreads-l1-1-3.dll /usr/lib64/wine/fakedlls/api-ms-win-core-processtopology-obsolete-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-psapi-ansi-l1-1-0.dll @@ -603,6 +607,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-wow64-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-xstate-l1-1-0.dll @@ -648,6 +653,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-mm-time-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-ntuser-rectangle-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-ntuser-sysparams-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-perf-legacy-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -1100,6 +1106,7 @@ /usr/lib64/wine/fakedlls/qmgrprxy.dll /usr/lib64/wine/fakedlls/quartz.dll /usr/lib64/wine/fakedlls/query.dll + /usr/lib64/wine/fakedlls/qwave.dll /usr/lib64/wine/fakedlls/rasapi32.dll /usr/lib64/wine/fakedlls/rasdlg.dll /usr/lib64/wine/fakedlls/reg.exe @@ -1714,6 +1721,7 @@ /usr/lib64/wine/qmgrprxy.dll.so /usr/lib64/wine/quartz.dll.so /usr/lib64/wine/query.dll.so + /usr/lib64/wine/qwave.dll.so /usr/lib64/wine/rasapi32.dll.so /usr/lib64/wine/rasdlg.dll.so /usr/lib64/wine/reg.exe.so @@ -2021,7 +2029,7 @@ emul32 - wine + wine /usr/bin/wine @@ -2115,6 +2123,7 @@ /usr/lib32/wine/api-ms-win-core-processthreads-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-core-processthreads-l1-1-1.dll.so /usr/lib32/wine/api-ms-win-core-processthreads-l1-1-2.dll.so + /usr/lib32/wine/api-ms-win-core-processthreads-l1-1-3.dll.so /usr/lib32/wine/api-ms-win-core-processtopology-obsolete-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-core-profile-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-core-psapi-ansi-l1-1-0.dll.so @@ -2164,6 +2173,7 @@ /usr/lib32/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so + /usr/lib32/wine/api-ms-win-core-winrt-string-l1-1-1.dll.so /usr/lib32/wine/api-ms-win-core-wow64-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-core-wow64-l1-1-1.dll.so /usr/lib32/wine/api-ms-win-core-xstate-l1-1-0.dll.so @@ -2209,6 +2219,7 @@ /usr/lib32/wine/api-ms-win-mm-time-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-ntuser-rectangle-l1-1-0.dll.so + /usr/lib32/wine/api-ms-win-ntuser-sysparams-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-perf-legacy-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-power-base-l1-1-0.dll.so /usr/lib32/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -2543,6 +2554,7 @@ /usr/lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-1.dll /usr/lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-2.dll + /usr/lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-3.dll /usr/lib32/wine/fakedlls/api-ms-win-core-processtopology-obsolete-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-core-psapi-ansi-l1-1-0.dll @@ -2592,6 +2604,7 @@ /usr/lib32/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll + /usr/lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-1.dll /usr/lib32/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-core-wow64-l1-1-1.dll /usr/lib32/wine/fakedlls/api-ms-win-core-xstate-l1-1-0.dll @@ -2637,6 +2650,7 @@ /usr/lib32/wine/fakedlls/api-ms-win-mm-time-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-ntuser-rectangle-l1-1-0.dll + /usr/lib32/wine/fakedlls/api-ms-win-ntuser-sysparams-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-perf-legacy-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll /usr/lib32/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -3118,6 +3132,7 @@ /usr/lib32/wine/fakedlls/qmgrprxy.dll /usr/lib32/wine/fakedlls/quartz.dll /usr/lib32/wine/fakedlls/query.dll + /usr/lib32/wine/fakedlls/qwave.dll /usr/lib32/wine/fakedlls/rasapi16.dll16 /usr/lib32/wine/fakedlls/rasapi32.dll /usr/lib32/wine/fakedlls/rasdlg.dll @@ -3788,6 +3803,7 @@ /usr/lib32/wine/qmgrprxy.dll.so /usr/lib32/wine/quartz.dll.so /usr/lib32/wine/query.dll.so + /usr/lib32/wine/qwave.dll.so /usr/lib32/wine/rasapi16.dll16.so /usr/lib32/wine/rasapi32.dll.so /usr/lib32/wine/rasdlg.dll.so @@ -4042,8 +4058,8 @@ programming.devel - wine-32bit - wine-devel + wine-32bit + wine-devel /usr/lib32/libwine.so @@ -4056,7 +4072,7 @@ programming.devel - wine + wine /usr/include/wine/debug.h @@ -5009,12 +5025,12 @@ - - 2018-10-26 - 3.19 + + 2018-11-09 + 3.20 Packaging update Pierre-Yves pyu@riseup.net - + \ No newline at end of file