Page MenuHomeSolus
Files F11049397

D1345.id3299.diff
No OneTemporary
Actions

D1345.id3299.diff
View Options

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 c2a4bb932e5f37c6ccd6e9934965041d5372e34f Mon Sep 17 00:00:00 2001
+From f0991570f98db2ffcb64fa88882ecccd40474392 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Wed, 20 Sep 2017 20:50:18 -0400
+Date: Sun, 5 Nov 2017 22:31:50 -0500
Subject: [PATCH] D3D9 Helper
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
@@ -18,7 +18,7 @@
create mode 100644 programs/winecfg/staging.c
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 76edd2a053..080ecb3a63 100644
+index 9c89d57154..5c493b98a4 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -93,6 +93,7 @@ struct builtin_load_info
@@ -29,7 +29,7 @@
NTSTATUS status;
WINE_MODREF *wm;
};
-@@ -124,7 +125,8 @@ static WINE_MODREF *cached_modref;
+@@ -118,7 +119,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 );
-@@ -475,7 +477,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
+@@ -469,7 +471,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)
-@@ -631,7 +633,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP
+@@ -625,7 +627,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 */
{
-@@ -639,7 +641,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP
+@@ -633,7 +635,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 );
}
-@@ -963,7 +965,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
+@@ -957,7 +959,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;
-@@ -985,7 +987,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
+@@ -979,7 +981,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 );
-@@ -1646,7 +1648,7 @@ static void load_builtin_callback( void *module, const char *filename )
+@@ -1640,7 +1642,7 @@ static void load_builtin_callback( void *module, const char *filename )
return;
}
@@ -93,7 +93,7 @@
RtlFreeHeap( GetProcessHeap(), 0, fullname );
if (!wm)
{
-@@ -1828,8 +1830,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len )
+@@ -1820,8 +1822,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len )
/******************************************************************************
* load_native_dll (internal)
*/
@@ -104,7 +104,7 @@
{
void *module;
HANDLE mapping;
-@@ -1863,7 +1865,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -1856,7 +1858,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;
-@@ -1927,8 +1929,8 @@ done:
+@@ -1918,8 +1920,8 @@ done:
/***********************************************************************
* load_builtin_dll
*/
@@ -124,7 +124,7 @@
{
char error[256], dllname[MAX_PATH];
const WCHAR *name, *p;
-@@ -1948,6 +1950,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
+@@ -1939,6 +1941,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;
-@@ -2266,14 +2269,14 @@ overflow:
+@@ -2257,14 +2260,14 @@ overflow:
return STATUS_BUFFER_TOO_SMALL;
}
@@ -149,7 +149,7 @@
{
enum loadorder loadorder;
WCHAR buffer[64];
-@@ -2310,6 +2313,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2301,6 +2304,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 ))
-@@ -2332,22 +2354,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2323,22 +2345,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))
{
-@@ -2357,7 +2379,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2348,7 +2370,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;
}
-@@ -2390,7 +2412,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
+@@ -2381,7 +2403,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))
{
-@@ -3361,7 +3383,7 @@ void __wine_process_init(void)
+@@ -3349,7 +3371,7 @@ void __wine_process_init(void)
/* setup the load callback and create ntdll modref */
wine_dll_set_callback( load_builtin_callback );
@@ -231,7 +231,7 @@
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
exit(1);
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
-index 401d256f1c..ec13e7542c 100644
+index 157d2cb2d7..9b2eab2cb9 100644
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -290,102 +290,165 @@ static inline enum loadorder get_env_load_order( const WCHAR *module )
@@ -622,10 +622,10 @@
+ return ret;
+}
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index c97b1e1f73..5219e50ea9 100644
+index 907bbdd2d9..3c90389fa6 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
-@@ -203,6 +203,7 @@ enum loadorder
+@@ -208,6 +208,7 @@ enum loadorder
};
extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN;
@@ -842,5 +842,5 @@
/* @makedep: winecfg.ico */
--
-2.14.1
+2.15.0
diff --git a/files/wine-d3d9.patch b/files/wine-d3d9.patch
--- a/files/wine-d3d9.patch
+++ b/files/wine-d3d9.patch
@@ -1,7 +1,7 @@
-From bdda3f3bc4f3840ffcbb6dcaf6d0cf452ea5421d Mon Sep 17 00:00:00 2001
+From f8574ff8a8c64fe6ab7a4399eb0d693e926f45d1 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Wed, 20 Sep 2017 20:49:35 -0400
-Subject: [PATCH] Wine D3D9
+Date: Sun, 5 Nov 2017 22:31:07 -0500
+Subject: [PATCH 2/2] Wine D3D9
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
---
@@ -9,7 +9,7 @@
dlls/d3d9-nine/Makefile.in | 15 +
dlls/d3d9-nine/d3d9-nine.spec | 14 +
dlls/d3d9-nine/d3d9_main.c | 173 ++++
- dlls/d3d9-nine/d3dadapter9.c | 853 ++++++++++++++++++
+ dlls/d3d9-nine/d3dadapter9.c | 898 +++++++++++++++++++
dlls/d3d9-nine/d3dadapter9.h | 32 +
dlls/d3d9-nine/device_wrap.c | 500 +++++++++++
dlls/d3d9-nine/device_wrap.h | 26 +
@@ -22,7 +22,7 @@
dlls/d3d9-nine/version.rc | 26 +
dlls/d3d9-nine/wndproc.c | 277 ++++++
dlls/d3d9-nine/wndproc.h | 41 +
- 17 files changed, 5567 insertions(+)
+ 17 files changed, 5612 insertions(+)
create mode 100644 dlls/d3d9-nine/Makefile.in
create mode 100644 dlls/d3d9-nine/d3d9-nine.spec
create mode 100644 dlls/d3d9-nine/d3d9_main.c
@@ -41,10 +41,10 @@
create mode 100644 dlls/d3d9-nine/wndproc.h
diff --git a/configure.ac b/configure.ac
-index 8f2885b2bc..88902214de 100644
+index 7a8fcc4987..0f2a45f336 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -66,6 +66,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]),
+@@ -67,6 +67,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]),
AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
[if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi])
AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
@@ -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]),
-@@ -390,6 +398,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
+@@ -391,6 +399,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
AC_SUBST(OPENGL_LIBS,"")
@@ -68,7 +68,7 @@
dnl **** Check for header files ****
AC_SYS_LARGEFILE()
-@@ -1247,6 +1257,183 @@ OpenGL and Direct3D won't be supported.])
+@@ -1248,6 +1258,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=""
-@@ -3097,6 +3284,7 @@ WINE_CONFIG_DLL(d3d8,,[implib])
+@@ -3127,6 +3314,7 @@ WINE_CONFIG_DLL(d3d8,,[implib])
WINE_CONFIG_TEST(dlls/d3d8/tests)
WINE_CONFIG_DLL(d3d9,,[implib])
WINE_CONFIG_TEST(dlls/d3d9/tests)
@@ -482,10 +482,10 @@
+}
diff --git a/dlls/d3d9-nine/d3dadapter9.c b/dlls/d3d9-nine/d3dadapter9.c
new file mode 100644
-index 0000000000..daa9524361
+index 0000000000..188eebf763
--- /dev/null
+++ b/dlls/d3d9-nine/d3dadapter9.c
-@@ -0,0 +1,853 @@
+@@ -0,0 +1,898 @@
+/*
+ * Wine IDirect3D9 interface using ID3DAdapter9
+ *
@@ -884,23 +884,68 @@
+static UINT WINAPI d3dadapter9_GetAdapterModeCountEx(struct d3dadapter9 *This,
+ UINT Adapter, const D3DDISPLAYMODEFILTER *pFilter)
+{
-+ FIXME("(%p, %u, %p), stub!\n", This, Adapter, pFilter);
-+ return 1;
++ FIXME("(%p, %u, %p), half stub!\n", This, Adapter, pFilter);
++ return d3dadapter9_GetAdapterModeCount(This, Adapter, pFilter->Format);
+}
+
+static HRESULT WINAPI d3dadapter9_EnumAdapterModesEx(struct d3dadapter9 *This,
+ UINT Adapter, const D3DDISPLAYMODEFILTER *pFilter, UINT Mode,
+ D3DDISPLAYMODEEX *pMode)
+{
-+ FIXME("(%p, %u, %p, %u, %p), stub!\n", This, Adapter, pFilter, Mode, pMode);
-+ return D3DERR_INVALIDCALL;
++ HRESULT hr;
++
++ FIXME("(%p, %u, %p, %u, %p), half stub!\n", This, Adapter, pFilter, Mode, pMode);
++
++ if (Adapter >= d3dadapter9_GetAdapterCount(This))
++ return D3DERR_INVALIDCALL;
++
++ hr = d3dadapter9_CheckDeviceFormat(This, Adapter, D3DDEVTYPE_HAL,
++ pFilter->Format, D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, pFilter->Format);
++
++ if (FAILED(hr))
++ {
++ TRACE("DeviceFormat not available.\n");
++ return hr;
++ }
++
++ if (Mode >= ADAPTER_OUTPUT.nmodes)
++ {
++ WARN("Mode %u does not exist.\n", Mode);
++ return D3DERR_INVALIDCALL;
++ }
++
++ pMode->Size = ADAPTER_OUTPUT.modes[Mode].Size;
++ pMode->Width = ADAPTER_OUTPUT.modes[Mode].Width;
++ pMode->Height = ADAPTER_OUTPUT.modes[Mode].Height;
++ pMode->RefreshRate = ADAPTER_OUTPUT.modes[Mode].RefreshRate;
++ pMode->Format = ADAPTER_OUTPUT.modes[Mode].Format;
++ pMode->ScanLineOrdering = ADAPTER_OUTPUT.modes[Mode].ScanLineOrdering;
++
++ return D3D_OK;
+}
+
+static HRESULT WINAPI d3dadapter9_GetAdapterDisplayModeEx(struct d3dadapter9 *This,
+ UINT Adapter, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation)
+{
-+ FIXME("(%p, %u, %p, %p), stub!\n", This, Adapter, pMode, pRotation);
-+ return D3DERR_INVALIDCALL;
++ UINT Mode;
++
++ if (Adapter >= d3dadapter9_GetAdapterCount(This))
++ return D3DERR_INVALIDCALL;
++
++ if (pMode)
++ {
++ Mode = ADAPTER_OUTPUT.current;
++ pMode->Size = sizeof(D3DDISPLAYMODEEX);
++ pMode->Width = ADAPTER_OUTPUT.modes[Mode].Width;
++ pMode->Height = ADAPTER_OUTPUT.modes[Mode].Height;
++ pMode->RefreshRate = ADAPTER_OUTPUT.modes[Mode].RefreshRate;
++ pMode->Format = ADAPTER_OUTPUT.modes[Mode].Format;
++ pMode->ScanLineOrdering = ADAPTER_OUTPUT.modes[Mode].ScanLineOrdering;
++ }
++ if (pRotation)
++ *pRotation = ADAPTER_OUTPUT.rotation;
++
++ return D3D_OK;
+}
+
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3dadapter9_CreateDeviceEx(struct d3dadapter9 *This,
@@ -5736,5 +5781,5 @@
+
+#endif
--
-2.14.1
+2.15.0
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : wine
-version : '2.20'
-release : 26
+version : '2.21'
+release : 27
source :
- - https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz : b444826c69048932fd51ac00b791d18528a4d4abd4c397e5bd51ac60eda455a5
+ - https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz : bafa04e8cfbb3c5fbb6bb5080fb5d3f2f6816ac69518d0ed50aceadb66b4abef
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
@@ -1798,7 +1798,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="26">wine</Dependency>
+ <Dependency release="27">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/wine</Path>
@@ -1813,8 +1813,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="26">wine-32bit</Dependency>
- <Dependency release="26">wine-devel</Dependency>
+ <Dependency release="27">wine-32bit</Dependency>
+ <Dependency release="27">wine-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.so</Path>
@@ -1827,7 +1827,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="26">wine</Dependency>
+ <Dependency release="27">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -1835,12 +1835,12 @@
</Files>
</Package>
<History>
- <Update release="26">
- <Date>2017-11-07</Date>
- <Version>2.20</Version>
+ <Update release="27">
+ <Date>2017-11-11</Date>
+ <Version>2.21</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 5:41 PM (2 h, 46 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5896591
Default Alt Text
D1345.id3299.diff (16 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.