diff --git a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch index 9e965b84..f5fa7639 100644 --- a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch +++ b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch @@ -1,7 +1,7 @@ -From 08d8e1c398ed6f3e237ad9fd3d29e10d09dcff3d Mon Sep 17 00:00:00 2001 +From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 2 May 2014 20:46:19 +0200 -Subject: user32: Decrease minimum SetTimer interval to 5 ms. (try 2) +Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2) --- dlls/user32/message.c | 2 +- @@ -9,10 +9,10 @@ Subject: user32: Decrease minimum SetTimer interval to 5 ms. (try 2) 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c -index d122980..aec0938 100644 +index 1336865112a..cbe9920384f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c -@@ -4443,7 +4443,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) +@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); @@ -22,25 +22,25 @@ index d122980..aec0938 100644 SERVER_START_REQ( set_win_timer ) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c -index d92fbc7..dbaddb7 100644 +index c0ba5834cf9..a6bc158e8a7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c -@@ -8521,6 +8521,7 @@ static void test_timers(void) +@@ -10282,6 +10282,7 @@ static void test_timers(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); +todo_wine ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, -@@ -8589,6 +8590,7 @@ static void test_timers_no_wnd(void) + || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, +@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); +todo_wine ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, - "did not get expected count for minimum timeout (%d != ~%d).\n", + || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, -- -2.5.1 +2.17.1 diff --git a/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch b/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch index ba08cda5..8006c599 100644 --- a/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch +++ b/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch @@ -1,4 +1,4 @@ -From bf5df83b1be55676dcd539b79d0f2ceabb9409a5 Mon Sep 17 00:00:00 2001 +From 882c25ffe94d7e8869ed5a364120cf0c5f2ef241 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Thu, 4 Apr 2019 02:25:00 +0300 Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for @@ -11,10 +11,10 @@ Signed-off-by: Paul Gofman 2 files changed, 141 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c -index 1d176970c6..9b6c9af570 100644 +index e2643e6589..a43bca7a14 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c -@@ -2910,10 +2910,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface, +@@ -2921,10 +2921,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface, wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } @@ -25,7 +25,7 @@ index 1d176970c6..9b6c9af570 100644 device->material = value; } else if (state == D3DLIGHTSTATE_COLORMODEL) -@@ -4794,7 +4792,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, +@@ -4807,7 +4805,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture); struct wined3d_texture *wined3d_texture = NULL; @@ -35,7 +35,7 @@ index 1d176970c6..9b6c9af570 100644 if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) wined3d_texture = surf->wined3d_texture; -@@ -4830,19 +4829,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, +@@ -4845,19 +4844,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice3(iface); struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture); @@ -70,7 +70,7 @@ index 1d176970c6..9b6c9af570 100644 static const struct tss_lookup diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c -index bc58c1817c..3c643afe15 100644 +index e3146ca45d..8861244e05 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -330,7 +330,7 @@ static IDirectDraw4 *create_ddraw(void) @@ -132,7 +132,7 @@ index bc58c1817c..3c643afe15 100644 static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h) { IDirect3DViewport3 *viewport; -@@ -16383,6 +16394,116 @@ static void test_d32_support(void) +@@ -16819,6 +16830,116 @@ static void test_surface_format_conversion_alpha(void) DestroyWindow(window); } @@ -249,14 +249,14 @@ index bc58c1817c..3c643afe15 100644 START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; -@@ -16515,6 +16636,7 @@ START_TEST(ddraw4) +@@ -16951,6 +17072,7 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_texture_wrong_caps(); test_caps(); test_d32_support(); - } + test_surface_format_conversion_alpha(); -- -2.20.1 +2.17.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 499c3046..0f6fa9e6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "292b728908563952f56b0585d072f3d7a08e93b2" + echo "5725ed3b46309b62469e4f305cb0b5a9b292dd43" } # Show version information