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 ee9b2c5e3eb1cd288b964f3f041e08b8191dad3b Mon Sep 17 00:00:00 2001 +From c2a4bb932e5f37c6ccd6e9934965041d5372e34f Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sat, 29 Jul 2017 12:12:31 -0400 +Date: Wed, 20 Sep 2017 20:50:18 -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 dd1f74c0fc..2616cd3a66 100644 +index 76edd2a053..080ecb3a63 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -93,6 +93,7 @@ struct builtin_load_info @@ -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 ); -@@ -449,7 +451,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS +@@ -475,7 +477,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 (process_attach( wm, NULL ) != STATUS_SUCCESS) -@@ -605,7 +607,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -631,7 +633,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 */ { -@@ -613,7 +615,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -639,7 +641,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 ); } -@@ -937,7 +939,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) +@@ -963,7 +965,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. */ @@ -75,7 +75,7 @@ { WINE_MODREF *wm; const WCHAR *p; -@@ -959,7 +961,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) +@@ -985,7 +987,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.TimeDateStamp = 0; wm->ldr.ActivationContext = 0; @@ -84,7 +84,7 @@ if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); -@@ -1620,7 +1622,7 @@ static void load_builtin_callback( void *module, const char *filename ) +@@ -1646,7 +1648,7 @@ static void load_builtin_callback( void *module, const char *filename ) return; } @@ -93,7 +93,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1802,8 +1804,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) +@@ -1828,8 +1830,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) /****************************************************************************** * load_native_dll (internal) */ @@ -104,7 +104,7 @@ { void *module; HANDLE mapping; -@@ -1837,7 +1839,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -1863,7 +1865,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* create the MODREF */ @@ -113,7 +113,7 @@ { status = STATUS_NO_MEMORY; goto done; -@@ -1901,8 +1903,8 @@ done: +@@ -1927,8 +1929,8 @@ done: /*********************************************************************** * load_builtin_dll */ @@ -124,7 +124,7 @@ { char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; -@@ -1922,6 +1924,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -1948,6 +1950,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, */ info.load_path = load_path; info.filename = NULL; @@ -132,7 +132,7 @@ info.status = STATUS_SUCCESS; info.wm = NULL; -@@ -2240,14 +2243,14 @@ overflow: +@@ -2266,14 +2269,14 @@ overflow: return STATUS_BUFFER_TOO_SMALL; } @@ -149,7 +149,7 @@ { enum loadorder loadorder; WCHAR buffer[64]; -@@ -2284,6 +2287,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2310,6 +2313,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -175,7 +175,7 @@ loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); if (handle && is_fake_dll( handle )) -@@ -2306,22 +2328,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2332,22 +2354,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ if (!handle) nts = STATUS_DLL_NOT_FOUND; else { @@ -203,7 +203,7 @@ if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { -@@ -2331,7 +2353,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2357,7 +2379,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) @@ -212,7 +212,7 @@ break; } -@@ -2364,7 +2386,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2390,7 +2412,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, RtlEnterCriticalSection( &loader_section ); if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -221,7 +221,7 @@ if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { -@@ -3335,7 +3357,7 @@ void __wine_process_init(void) +@@ -3361,7 +3383,7 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -622,7 +622,7 @@ + return ret; +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index ba296d25c3..9b1dd45fff 100644 +index c97b1e1f73..5219e50ea9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -203,6 +203,7 @@ enum loadorder @@ -814,7 +814,7 @@ /* Drive management */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 72c3e1ba01..b9c0afc005 100644 +index 5908b491d4..a2da7e6b3a 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -39,6 +39,7 @@ BEGIN @@ -842,5 +842,5 @@ /* @makedep: winecfg.ico */ -- -2.13.3 +2.14.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 609ea84211a2b8ebd81edb930c2068a615c6ede7 Mon Sep 17 00:00:00 2001 +From bdda3f3bc4f3840ffcbb6dcaf6d0cf452ea5421d Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sat, 29 Jul 2017 12:11:28 -0400 +Date: Wed, 20 Sep 2017 20:49:35 -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 5a920d6a3f..4319bed58f 100644 +index 8f2885b2bc..88902214de 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -68,7 +68,7 @@ dnl **** Check for header files **** AC_SYS_LARGEFILE() -@@ -1249,6 +1259,183 @@ OpenGL and Direct3D won't be supported.]) +@@ -1247,6 +1257,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="" -@@ -3089,6 +3276,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) +@@ -3097,6 +3284,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) WINE_CONFIG_TEST(dlls/d3d9/tests) @@ -5736,5 +5736,5 @@ + +#endif -- -2.13.3 +2.14.1 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : wine -version : '2.17' -release : 23 +version : '2.18' +release : 24 source : - - https://dl.winehq.org/wine/source/2.x/wine-2.17.tar.xz : 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 + - https://dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz : 9f0931129878157d717cb39f16cd33bf49f40aac77331c93d0ad30f2ccac4f50 license : LGPL-2.1 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 @@ -2,8 +2,8 @@ wine - Joshua Strobl - joshua@stroblindustries.com + Pierre-Yves + pyu@riseup.net LGPL-2.1 virt @@ -52,6 +52,7 @@ /usr/lib64/wine/api-ms-win-core-errorhandling-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so + /usr/lib64/wine/api-ms-win-core-errorhandling-l1-1-3.dll.so /usr/lib64/wine/api-ms-win-core-fibers-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-fibers-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-file-l1-1-0.dll.so @@ -59,6 +60,7 @@ /usr/lib64/wine/api-ms-win-core-file-l1-2-1.dll.so /usr/lib64/wine/api-ms-win-core-file-l2-1-0.dll.so /usr/lib64/wine/api-ms-win-core-file-l2-1-1.dll.so + /usr/lib64/wine/api-ms-win-core-file-l2-1-2.dll.so /usr/lib64/wine/api-ms-win-core-handle-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-heap-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-heap-l1-2-0.dll.so @@ -101,6 +103,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-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 /usr/lib64/wine/api-ms-win-core-psapi-l1-1-0.dll.so @@ -135,6 +138,7 @@ /usr/lib64/wine/api-ms-win-core-url-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-util-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-version-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-core-version-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-version-private-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-versionansi-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-windowserrorreporting-l1-1-0.dll.so @@ -146,6 +150,7 @@ /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-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 /usr/lib64/wine/api-ms-win-core-xstate-l2-1-0.dll.so /usr/lib64/wine/api-ms-win-crt-conio-l1-1-0.dll.so @@ -181,10 +186,12 @@ /usr/lib64/wine/api-ms-win-eventing-legacy-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-eventing-provider-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-mm-joystick-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-mm-misc-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-mm-mme-l1-1-0.dll.so /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-power-base-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-power-setting-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-rtcore-ntuser-private-l1-1-0.dll.so @@ -354,6 +361,7 @@ /usr/lib64/wine/dswave.dll.so /usr/lib64/wine/dwmapi.dll.so /usr/lib64/wine/dwrite.dll.so + /usr/lib64/wine/dx8vb.dll.so /usr/lib64/wine/dxdiag.exe.so /usr/lib64/wine/dxdiagn.dll.so /usr/lib64/wine/dxgi.dll.so @@ -419,6 +427,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll + /usr/lib64/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-3.dll /usr/lib64/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-file-l1-1-0.dll @@ -426,6 +435,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-core-file-l1-2-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll + /usr/lib64/wine/fakedlls/api-ms-win-core-file-l2-1-2.dll /usr/lib64/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-heap-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll @@ -468,6 +478,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-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 /usr/lib64/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll @@ -502,6 +513,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-version-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-core-version-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-version-private-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-versionansi-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-windowserrorreporting-l1-1-0.dll @@ -513,6 +525,7 @@ /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-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 /usr/lib64/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll @@ -548,10 +561,12 @@ /usr/lib64/wine/fakedlls/api-ms-win-eventing-legacy-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-mm-joystick-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll /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-power-base-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-rtcore-ntuser-private-l1-1-0.dll @@ -721,6 +736,7 @@ /usr/lib64/wine/fakedlls/dswave.dll /usr/lib64/wine/fakedlls/dwmapi.dll /usr/lib64/wine/fakedlls/dwrite.dll + /usr/lib64/wine/fakedlls/dx8vb.dll /usr/lib64/wine/fakedlls/dxdiag.exe /usr/lib64/wine/fakedlls/dxdiagn.dll /usr/lib64/wine/fakedlls/dxgi.dll @@ -981,6 +997,7 @@ /usr/lib64/wine/fakedlls/rundll32.exe /usr/lib64/wine/fakedlls/samlib.dll /usr/lib64/wine/fakedlls/sane.ds + /usr/lib64/wine/fakedlls/sapi.dll /usr/lib64/wine/fakedlls/sc.exe /usr/lib64/wine/fakedlls/scarddlg.dll /usr/lib64/wine/fakedlls/sccbase.dll @@ -1293,6 +1310,7 @@ /usr/lib64/wine/libmapi32.def /usr/lib64/wine/libmf.def /usr/lib64/wine/libmfplat.def + /usr/lib64/wine/libmfuuid.a /usr/lib64/wine/libmlang.def /usr/lib64/wine/libmpr.def /usr/lib64/wine/libmprapi.def @@ -1571,6 +1589,7 @@ /usr/lib64/wine/rundll32.exe.so /usr/lib64/wine/samlib.dll.so /usr/lib64/wine/sane.ds.so + /usr/lib64/wine/sapi.dll.so /usr/lib64/wine/sc.exe.so /usr/lib64/wine/scarddlg.dll.so /usr/lib64/wine/sccbase.dll.so @@ -1767,7 +1786,7 @@ emul32 - wine + wine /usr/bin/wine @@ -1782,8 +1801,8 @@ programming.devel - wine-32bit - wine-devel + wine-32bit + wine-devel /usr/lib32/lib*.so @@ -1796,7 +1815,7 @@ programming.devel - wine + wine /usr/include/ @@ -1804,12 +1823,12 @@ - - 2017-09-20 - 2.17 + + 2017-09-30 + 2.18 Packaging update - Joshua Strobl - joshua@stroblindustries.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file