Added dxvk-revert for osu!, fixed "steamuser" in Wine and bump pkgrel

- Added a patch reverting some dxvk commits to fix osu! compat mode stuck on black screen - Added a patch reverting Proton's "steamuser" to Wine's usual username implementation - Updated pkgrel to 9-5
whrvt · Sep 24, 2024 · 5289903 · 5289903
1 parent 04aef01
commit 5289903
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 1 deletion.
diff --git a/patches/proton/0001-dxvk-revert-osu.patch b/patches/proton/0001-dxvk-revert-osu.patch
@@ -0,0 +1,181 @@
+diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
+index 59ae516a..12977f04 100644
+--- a/dxvk/src/d3d9/d3d9_device.cpp
++++ b/dxvk/src/d3d9/d3d9_device.cpp
+@@ -1094,12 +1094,7 @@ namespace dxvk {
+     if (unlikely(iSwapChain != 0))
+       return D3DERR_INVALIDCALL;
+
+-    D3D9DeviceLock lock = LockDevice();
+-
+-    // In windowed mode, GetFrontBufferData takes a screenshot of the entire screen.
+-    // We use the last used swapchain as a workaround.
+-    // Total War: Medieval 2 relies on this.
+-    return m_mostRecentlyUsedSwapchain->GetFrontBufferData(pDestSurface);
++    return m_implicitSwapchain->GetFrontBufferData(pDestSurface);
+   }
+
+
+@@ -8016,10 +8011,8 @@ namespace dxvk {
+       if (FAILED(hr))
+         return hr;
+     }
+-    else {
++    else
+       m_implicitSwapchain = new D3D9SwapChainEx(this, pPresentationParameters, pFullscreenDisplayMode);
+-      m_mostRecentlyUsedSwapchain = m_implicitSwapchain.ptr();
+-    }
+
+     if (pPresentationParameters->EnableAutoDepthStencil) {
+       D3D9_COMMON_TEXTURE_DESC desc;
+diff --git a/src/d3d9/d3d9_device.h b/src/d3d9/d3d9_device.h
+index be2ad81c..5a293bb9 100644
+--- a/dxvk/src/d3d9/d3d9_device.h
++++ b/dxvk/src/d3d9/d3d9_device.h
+@@ -1261,34 +1261,6 @@ namespace dxvk {
+
+     uint64_t GetCurrentSequenceNumber();
+
+-    /**
+-     * @brief Get the swapchain that was used the most recently for presenting
+-     * Has to be externally synchronized.
+-     * 
+-     * @return D3D9SwapChainEx* Swapchain
+-     */
+-    D3D9SwapChainEx* GetMostRecentlyUsedSwapchain() {
+-      return m_mostRecentlyUsedSwapchain;
+-    }
+-
+-    /**
+-     * @brief Set the swapchain that was used the most recently for presenting
+-     * Has to be externally synchronized.
+-     * 
+-     * @param swapchain Swapchain
+-     */
+-    void SetMostRecentlyUsedSwapchain(D3D9SwapChainEx* swapchain) {
+-      m_mostRecentlyUsedSwapchain = swapchain;
+-    }
+-
+-    /**
+-     * @brief Reset the most recently swapchain back to the implicit one
+-     * Has to be externally synchronized.
+-     */
+-    void ResetMostRecentlyUsedSwapchain() {
+-      m_mostRecentlyUsedSwapchain = m_implicitSwapchain.ptr();
+-    }
+-
+     Com<D3D9InterfaceEx>            m_parent;
+     D3DDEVTYPE                      m_deviceType;
+     HWND                            m_window;
+@@ -1457,8 +1429,6 @@ namespace dxvk {
+     HWND                            m_fullscreenWindow         = NULL;
+     std::atomic<uint32_t>           m_losableResourceCounter   = { 0 };
+
+-    D3D9SwapChainEx*                m_mostRecentlyUsedSwapchain = nullptr;
+-
+ #ifdef D3D9_ALLOW_UNMAPPING
+     lru_list<D3D9CommonTexture*>    m_mappedTextures;
+ #endif
+diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp
+index fcfd65d0..68d10b24 100644
+--- a/dxvk/src/d3d9/d3d9_swapchain.cpp
++++ b/dxvk/src/d3d9/d3d9_swapchain.cpp
+@@ -65,16 +65,6 @@ namespace dxvk {
+     if (this_thread::isInModuleDetachment())
+       return;
+
+-    {
+-      // Locking here and in Device::GetFrontBufferData
+-      // ensures that other threads don't accidentally access a stale pointer.
+-      D3D9DeviceLock lock = m_parent->LockDevice();
+-
+-      if (m_parent->GetMostRecentlyUsedSwapchain() == this) {
+-        m_parent->ResetMostRecentlyUsedSwapchain();
+-      }
+-    }
+-
+     DestroyBackBuffers();
+
+     ResetWindowProc(m_window);
+@@ -122,8 +112,6 @@ namespace dxvk {
+           DWORD    dwFlags) {
+     D3D9DeviceLock lock = m_parent->LockDevice();
+
+-    m_parent->SetMostRecentlyUsedSwapchain(this);
+-
+     if (unlikely(m_parent->IsDeviceLost()))
+       return D3DERR_DEVICELOST;
+
+@@ -400,20 +388,6 @@ namespace dxvk {
+       blitInfo.srcOffsets[0] = VkOffset3D{ 0, 0, 0 };
+       blitInfo.srcOffsets[1] = VkOffset3D{ int32_t(srcExtent.width),  int32_t(srcExtent.height),  1 };
+
+-#ifdef _WIN32
+-      if (m_presentParams.Windowed) {
+-        // In windowed mode, GetFrontBufferData takes a screenshot of the entire screen.
+-        // So place the copy of the front buffer at the position of the window.
+-        POINT point = { 0, 0 };
+-        if (ClientToScreen(m_window, &point) != 0) {
+-          blitInfo.dstOffsets[0].x = point.x;
+-          blitInfo.dstOffsets[0].y = point.y;
+-          blitInfo.dstOffsets[1].x += point.x;
+-          blitInfo.dstOffsets[1].y += point.y;
+-        }
+-      }
+-#endif
+-
+       m_parent->EmitCs([
+         cDstImage = blittedSrc,
+         cDstMap   = dstTexInfo->GetMapping().Swizzle,
+diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp
+index c8ed3a1c..e18326a0 100644
+--- a/dxvk/src/util/config/config.cpp
++++ b/dxvk/src/util/config/config.cpp
+@@ -881,10 +881,10 @@ namespace dxvk {
+     { R"(\\UK Truck Simulator\\bin\\win_x86\\game\.exe$)", {{
+       { "d3d9.floatEmulation",              "Strict" },
+     }} },
+-    /* d3d9 Supreme Ruler games              *
++    /* Supreme Ruler Ultimate                    *
+      * Leaks a StateBlock leading                *
+      * to Reset calls failing                    */
+-    { R"(\\SupremeRuler(Ultimate|GreatWar|1936|CW)\.exe$)", {{
++    { R"(\\SupremeRulerUltimate\.exe$)", {{
+       { "d3d9.countLosableResources",       "False" },
+     }} },
+     /* Operation Flashpoint: Red River           *
+diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
+index e53c96a3..7320f079 100644
+--- a/dxvk/src/d3d9/d3d9_device.cpp
++++ b/dxvk/src/d3d9/d3d9_device.cpp
+@@ -482,14 +482,6 @@ namespace dxvk {
+       return hr;
+     }
+
+-    // Unbind all buffers that were still bound to the backend to avoid leaks.
+-    EmitCs([](DxvkContext* ctx) {
+-      ctx->bindIndexBuffer(DxvkBufferSlice(), VK_INDEX_TYPE_UINT32);
+-      for (uint32_t i = 0; i < caps::MaxStreams; i++) {
+-        ctx->bindVertexBuffer(i, DxvkBufferSlice(), 0);
+-      }
+-    });
+-
+     Flush();
+     SynchronizeCsThread(DxvkCsThread::SynchronizeAll);
+
+@@ -1616,15 +1608,6 @@ namespace dxvk {
+     ConsiderFlush(GpuFlushType::ImplicitStrongHint);
+
+     m_flags.clr(D3D9DeviceFlag::InScene);
+-
+-    // D3D9 resets the internally bound vertex buffers and index buffer in EndScene if they were unbound in the meantime.
+-    // We have to ignore unbinding those buffers because of Operation Flashpoint Red River,
+-    // so we should also clear the bindings here, to avoid leaks.
+-    if (m_state.indices == nullptr) {
+-      EmitCs([](DxvkContext* ctx) {
+-        ctx->bindIndexBuffer(DxvkBufferSlice(), VK_INDEX_TYPE_UINT32);
+-      });
+-    }
+
+     for (uint32_t i = 0; i < caps::MaxStreams; i++) {
+       if (m_state.vertexBuffers[i].vertexBuffer == nullptr) {
diff --git a/patches/wine/0004-proton-annoyances/0001-desteamify-proton-username.patch b/patches/wine/0004-proton-annoyances/0001-desteamify-proton-username.patch
@@ -0,0 +1,51 @@
+diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
+index 127cec57252..2284e92b263 100644
+--- a/dlls/advapi32/advapi.c
++++ b/dlls/advapi32/advapi.c
+@@ -44,15 +44,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
+  */
+ BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size )
+ {
+-    static const char steamuserA[] = {'s','t','e','a','m','u','s','e','r',0};
+-    if(*size < ARRAY_SIZE(steamuserA)){
+-        SetLastError( ERROR_INSUFFICIENT_BUFFER );
+-        *size = ARRAY_SIZE(steamuserA);
+-        return FALSE;
+-    }
+-    memcpy(name, steamuserA, sizeof(steamuserA));
+-    *size = ARRAY_SIZE(steamuserA);
+-    return TRUE;
++    DWORD len = GetEnvironmentVariableA( "WINEUSERNAME", name, *size );
++    BOOL ret;
++
++    if (!len) return FALSE;
++    if ((ret = (len < *size))) len++;
++    else SetLastError( ERROR_INSUFFICIENT_BUFFER );
++    *size = len;
++    return ret;
+ }
+
+ /******************************************************************************
+@@ -60,15 +59,14 @@ BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size )
+  */
+ BOOL WINAPI GetUserNameW( LPWSTR name, LPDWORD size )
+ {
+-    static const WCHAR steamuserW[] = {'s','t','e','a','m','u','s','e','r',0};
+-    if(*size < ARRAY_SIZE(steamuserW)){
+-        SetLastError( ERROR_INSUFFICIENT_BUFFER );
+-        *size = ARRAY_SIZE(steamuserW);
+-        return FALSE;
+-    }
+-    memcpy(name, steamuserW, sizeof(steamuserW));
+-    *size = ARRAY_SIZE(steamuserW);
+-    return TRUE;
++    DWORD len = GetEnvironmentVariableW( L"WINEUSERNAME", name, *size );
++    BOOL ret;
++
++    if (!len) return FALSE;
++    if ((ret = (len < *size))) len++;
++    else SetLastError( ERROR_INSUFFICIENT_BUFFER );
++    *size = len;
++    return ret;
+ }
+
diff --git a/setup.sh b/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pkgver=9-4
+pkgver=9-5
 buildname="proton-osu"
 pkgname="${buildname}-${pkgver}"