wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Zebediah Figura : wineqtdecoder/qtvdecoder: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: b41b19ff7bda5d309ce5102fc6994c5d35c84f36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41b19ff7bda5d309ce5102f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:33 2019 -0600 wineqtdecoder/qtvdecoder: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 8108133f97..379150d9a0 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -236,7 +236,7 @@ static void trackingCallback( } LeaveCriticalSection(&This->tf.csReceive); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, pOutSample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr);

1 0

Zebediah Figura : winegstreamer/gsttffilter: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 1b3d163208096993ec7e6603d4107bf1ee2ac13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3d163208096993ec7e6603… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:32 2019 -0600 winegstreamer/gsttffilter: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 8619cc6b3f..baa4c0c2c5 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -205,7 +205,7 @@ GstFlowReturn got_data(GstPad *pad, GstObject *parent, GstBuffer *buf) IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); IMediaSample_SetActualDataLength(sample, gst_buffer_get_size(buf)); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, sample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, sample); IMediaSample_Release(sample); gst_buffer_unref(buf); if (FAILED(hr))

1 0

Zebediah Figura : quartz/avidec: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive().
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: b2b33c2623124fcbc67cfd29486e43be6349d0a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b33c2623124fcbc67cfd29… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:31 2019 -0600 quartz/avidec: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive(). There's no reason to do this, and there may never have been. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 63c5aefcc5..cbe109df2b 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -183,9 +183,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) else IMediaSample_SetMediaTime(pOutSample, NULL, NULL); - LeaveCriticalSection(&This->tf.csReceive); hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); - EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr);

1 0

Zebediah Figura : quartz/avidec: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 0509eb29045a701f9687b9d09bbe00e9622e9dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0509eb29045a701f9687b9d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:30 2019 -0600 quartz/avidec: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 7352a28db8..63c5aefcc5 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -184,7 +184,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) IMediaSample_SetMediaTime(pOutSample, NULL, NULL); LeaveCriticalSection(&This->tf.csReceive); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, pOutSample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr);

1 0

Gijs Vermeulen : msvcrt: Avoid compiler warning.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: cb7f92117764ae42cf7ab10d5fac67a865abbd1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb7f92117764ae42cf7ab10d… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Tue Nov 26 17:49:19 2019 +0100 msvcrt: Avoid compiler warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 0d5b64a4aa..592b049107 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1170,6 +1170,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return ret; } +#if _MSVCR_VER>=140 static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_size_t max, BOOL is_dst) { MSVCRT_long tz = MSVCRT___timezone + (is_dst ? MSVCRT__dstbias : 0); @@ -1188,6 +1189,7 @@ static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return FALSE; return strftime_int(str, pos, max, tz/60%60, 2, 0, 59); } +#endif static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, const STRFTIME_CHAR *format, const struct MSVCRT_tm *mstm,

1 0

Damjan Jovanovic : comctl32: Allocate the right wstr size for the TVN_GETDISPINFOW reply.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: d558896fff1df9b595cb1d74ce387852c8a4eaab URL: https://source.winehq.org/git/wine.git/?a=commit;h=d558896fff1df9b595cb1d74… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 26 18:08:22 2019 +0200 comctl32: Allocate the right wstr size for the TVN_GETDISPINFOW reply. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25264 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0d2c825714..06c4586fcd 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -754,7 +754,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else { int len = max(lstrlenW(callback.item.pszText) + 1, TEXT_CALLBACK_SIZE); - LPWSTR newText = heap_realloc(item->pszText, len); + LPWSTR newText = heap_realloc(item->pszText, len*sizeof(WCHAR)); TRACE("returned wstr %s, len=%d\n", debugstr_w(callback.item.pszText), len);

1 0

Chip Davis : ntdll: Fix macOS build.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 0d1029e8293915eb2b17fd35b3481f70e626a402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d1029e8293915eb2b17fd35… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Nov 26 10:02:19 2019 -0600 ntdll: Fix macOS build. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f59aba0358..589fb68d7a 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -37,6 +37,7 @@ # include <mach/machine.h> #endif #ifdef HAVE_IOKIT_IOKITLIB_H +# include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> # include <IOKit/pwr_mgt/IOPM.h> # include <IOKit/pwr_mgt/IOPMLib.h>

1 0

Zebediah Figura : wined3d: Get rid of wined3d_device_begin_stateblock() and wined3d_device_end_stateblock().
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 00f7878e7e52ccdd27c2a4b4857c440a1c4242b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00f7878e7e52ccdd27c2a4b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 09:57:39 2019 -0600 wined3d: Get rid of wined3d_device_begin_stateblock() and wined3d_device_end_stateblock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 51 ----------------------------------------------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 3 files changed, 55 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5983281f93..f2d060184b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4091,57 +4091,6 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic return wined3d_swapchain_get_display_mode(swapchain, mode, rotation); } -HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device, - struct wined3d_stateblock **stateblock) -{ - struct wined3d_stateblock *object; - HRESULT hr; - - TRACE("device %p.\n", device); - - if (device->recording) - { - *stateblock = NULL; - return WINED3DERR_INVALIDCALL; - } - - hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &object); - if (FAILED(hr)) - return hr; - - device->recording = object; - device->update_stateblock_state = &object->stateblock_state; - wined3d_stateblock_incref(object); - *stateblock = object; - - TRACE("Recording stateblock %p.\n", *stateblock); - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) -{ - struct wined3d_stateblock *stateblock = device->recording; - - TRACE("device %p.\n", device); - - if (!device->recording) - { - WARN("Not recording.\n"); - return WINED3DERR_INVALIDCALL; - } - - wined3d_stateblock_init_contained_states(stateblock); - - wined3d_stateblock_decref(device->recording); - device->recording = NULL; - device->update_stateblock_state = &device->stateblock_state; - - TRACE("Ending stateblock %p.\n", stateblock); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_begin_scene(struct wined3d_device *device) { /* At the moment we have no need for any functionality at the beginning diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 29bcd75926..9c05dd8e93 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -38,7 +38,6 @@ @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) -@ cdecl wined3d_device_begin_stateblock(ptr ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @@ -56,7 +55,6 @@ @ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) -@ cdecl wined3d_device_end_stateblock(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 37e012b979..f455cdb979 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2233,7 +2233,6 @@ ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, @@ -2269,7 +2268,6 @@ void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *devi void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device);

1 0

Zebediah Figura : d3d9: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock().
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: afd5261d69726f349bfe3c55f78fc193a719e816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd5261d69726f349bfe3c55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 09:57:38 2019 -0600 d3d9: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 17 ++++++++++++----- dlls/d3d9/tests/device.c | 7 ------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 76fddc59f1..0657cc2f76 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2400,7 +2400,14 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INVALIDCALL; + } + + if (SUCCEEDED(hr = wined3d_stateblock_create(device->wined3d_device, WINED3D_SBT_RECORDED, &stateblock))) device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); @@ -2417,14 +2424,14 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire TRACE("iface %p, stateblock %p.\n", iface, stateblock); wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device); - if (FAILED(hr)) + if (!device->recording) { wined3d_mutex_unlock(); - WARN("Failed to end the stateblock, hr %#x.\n", hr); - return hr; + WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); + return D3DERR_INVALIDCALL; } wined3d_stateblock = device->recording; + wined3d_stateblock_init_contained_states(wined3d_stateblock); device->recording = NULL; device->update_state = device->state; wined3d_mutex_unlock(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 75cddbb6db..03ebe242e9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3048,19 +3048,12 @@ static void test_draw_primitive(void) hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); -todo_wine ok(!current_vb, "Unexpected vb %p.\n", current_vb); ok(!offset, "Unexpected offset %u.\n", offset); -todo_wine ok(!stride, "Unexpected stride %u.\n", stride); - if (current_vb) - IDirect3DVertexBuffer9_Release(current_vb); hr = IDirect3DDevice9_GetIndices(device, &current_ib); ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); -todo_wine ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); - if (current_ib) - IDirect3DIndexBuffer9_Release(current_ib); hr = IDirect3DStateBlock9_Capture(stateblock); ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr);

1 0

Zebediah Figura : d3d8: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock().
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: af5634fb6eee4cf3117c0e09a56cad3eb4924eb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5634fb6eee4cf3117c0e09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 09:57:37 2019 -0600 d3d8: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 20 +++++++++++++------- dlls/d3d8/tests/device.c | 8 -------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e85fd72d02..564dc9d9d0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1902,7 +1902,14 @@ static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INVALIDCALL; + } + + if (SUCCEEDED(hr = wined3d_stateblock_create(device->wined3d_device, WINED3D_SBT_RECORDED, &stateblock))) device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); @@ -1913,7 +1920,6 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr; TRACE("iface %p, token %p.\n", iface, token); @@ -1921,14 +1927,14 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * * of memory later and cause locking problems) */ wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device); - if (FAILED(hr)) + if (!device->recording) { - WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); - return hr; + WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); + return D3DERR_INVALIDCALL; } stateblock = device->recording; + wined3d_stateblock_init_contained_states(stateblock); device->recording = NULL; device->update_state = device->state; @@ -1947,7 +1953,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * TRACE("Returning %#x (%p).\n", *token, stateblock); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9fc06c3c9d..f598ad4f45 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9665,20 +9665,12 @@ static void test_draw_primitive(void) hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); -todo_wine { ok(!current_vb, "Unexpected vb %p.\n", current_vb); ok(!stride, "Unexpected stride %u.\n", stride); -} - if (current_vb) - IDirect3DVertexBuffer8_Release(current_vb); hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); -todo_wine { ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); -} - if (current_ib) - IDirect3DIndexBuffer8_Release(current_ib); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019