November 2019 - Wine-Commits

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

Nov. 26, 2019

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

Michael Stefaniuc : dmstyle: Move 3 structs where they are used and get rid of typedefs.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: b9a50481089bf72003f9281ad93caa8d88e43030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a50481089bf72003f9281a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 26 21:14:39 2019 +0100 dmstyle: Move 3 structs where they are used and get rid of typedefs. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmstyle_private.h | 23 ----------------------- dlls/dmstyle/style.c | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 7d18e9c4ba..2956dad151 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -55,29 +55,6 @@ extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPE /***************************************************************************** * Auxiliary definitions */ -typedef struct _DMUS_PRIVATE_STYLE_BAND { - struct list entry; /* for listing elements */ - IDirectMusicBand* pBand; -} DMUS_PRIVATE_STYLE_BAND, *LPDMUS_PRIVATE_STYLE_BAND; - -typedef struct _DMUS_PRIVATE_STYLE_PARTREF_ITEM { - struct list entry; /* for listing elements */ - DMUS_OBJECTDESC desc; - DMUS_IO_PARTREF part_ref; -} DMUS_PRIVATE_STYLE_PARTREF_ITEM, *LPDMUS_PRIVATE_STYLE_PARTREF_ITEM; - -typedef struct _DMUS_PRIVATE_STYLE_MOTIF { - struct list entry; /* for listing elements */ - DWORD dwRhythm; - DMUS_IO_PATTERN pattern; - DMUS_OBJECTDESC desc; - /** optional for motifs */ - DMUS_IO_MOTIFSETTINGS settings; - IDirectMusicBand* pBand; - - struct list Items; -} DMUS_PRIVATE_STYLE_MOTIF, *LPDMUS_PRIVATE_STYLE_MOTIF; - typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct list entry; /* for listing elements */ DWORD dwTimeStamp; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 0884733894..7c835afe27 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -20,10 +20,33 @@ #include "dmstyle_private.h" #include "dmobject.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +struct style_band { + struct list entry; + IDirectMusicBand *pBand; +}; + +struct style_partref_item { + struct list entry; + DMUS_OBJECTDESC desc; + DMUS_IO_PARTREF part_ref; +}; + +struct style_motif { + struct list entry; + DWORD dwRhythm; + DMUS_IO_PATTERN pattern; + DMUS_OBJECTDESC desc; + /** optional for motifs */ + DMUS_IO_MOTIFSETTINGS settings; + IDirectMusicBand *pBand; + struct list Items; +}; + /***************************************************************************** * IDirectMusicStyleImpl implementation */ @@ -283,14 +306,13 @@ static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand) } static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, - DMUS_PRIVATE_STYLE_MOTIF *pNewMotif) + struct style_motif *pNewMotif) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - - LPDMUS_PRIVATE_STYLE_PARTREF_ITEM pNewItem = NULL; + struct style_partref_item *pNewItem = NULL; if (pChunk->fccID != DMUS_FOURCC_PARTREF_LIST) { @@ -308,7 +330,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, switch (Chunk.fccID) { case DMUS_FOURCC_PARTREF_CHUNK: { TRACE_(dmfile)(": PartRef chunk\n"); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_PARTREF_ITEM)); + pNewItem = heap_alloc_zero(sizeof(*pNewItem)); if (!pNewItem) { ERR(": no more memory\n"); return E_OUTOFMEMORY; @@ -514,9 +536,8 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - IDirectMusicBand* pBand = NULL; - LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif = NULL; + struct style_motif *pNewMotif = NULL; if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); @@ -534,7 +555,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU case DMUS_FOURCC_PATTERN_CHUNK: { TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ - pNewMotif = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_MOTIF)); + pNewMotif = heap_alloc_zero(sizeof(*pNewMotif)); if (NULL == pNewMotif) { ERR(": no more memory\n"); return E_OUTOFMEMORY; @@ -715,7 +736,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { LPSTREAM pClonedStream = NULL; - LPDMUS_PRIVATE_STYLE_BAND pNewBand; + struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); @@ -731,8 +752,8 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK return hr; } IStream_Release (pClonedStream); - - pNewBand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_BAND)); + + pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { ERR(": no more memory\n"); return E_OUTOFMEMORY;

1 0

Michael Stefaniuc : dmstyle: Implement IDirectMusicStyle8_EnumMotif().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: ce275f38a02dd5f809eea45ff3fa02f645b56a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce275f38a02dd5f809eea45f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 26 21:14:41 2019 +0100 dmstyle: Implement IDirectMusicStyle8_EnumMotif(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index b3bce9bba2..5ebe6589d4 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -158,12 +158,37 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, - WCHAR *pwszName) +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, + WCHAR *name) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + const struct style_motif *motif = NULL; + const struct list *cursor; + unsigned int i = 0; + + TRACE("(%p, %u, %p)\n", This, index, name); + + if (!name) + return E_POINTER; + + /* index is zero based */ + LIST_FOR_EACH(cursor, &This->motifs) { + if (i == index) { + motif = LIST_ENTRY(cursor, struct style_motif, entry); + break; + } + i++; + } + if (!motif) + return S_FALSE; + + if (motif->desc.dwValidData & DMUS_OBJ_NAME) + lstrcpynW(name, motif->desc.wszName, DMUS_MAX_NAME); + else + name[0] = 0; + + TRACE("returning name: %s\n", debugstr_w(name)); + return S_OK; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName,

1 0

Zebediah Figura : wineqtdecoder/qtvdecoder: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: d45456cecba12fd9c468bf0e60934ca2cbd6e688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45456cecba12fd9c468bf0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:34 2019 -0600 wineqtdecoder/qtvdecoder: 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/wineqtdecoder/qtvdecoder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 379150d9a0..3da0738aec 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -235,9 +235,7 @@ static void trackingCallback( IMediaSample_SetTime(pOutSample, &tStart, &tStop); } - 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

Gijs Vermeulen : msvcrt: Avoid compiler warning.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

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

Chip Davis : ntdll: Fix macOS build.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

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 Nov. 26, 2019

Nov. 26, 2019

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

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

Nov. 26, 2019

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

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

Nov. 26, 2019

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

Nikolay Sivov : mfplat/tests: Fix buffer object leak (Valgrind).
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: fd3fb2efdb4dc94fe267e1b92fbe2aeb28c27c34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3fb2efdb4dc94fe267e1b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 13:35:31 2019 +0300 mfplat/tests: Fix buffer object leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 832b52713c..1db4d2dcc4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1712,6 +1712,8 @@ todo_wine todo_wine ok(count == 1, "Unexpected buffer count %u.\n", count); + IMFMediaBuffer_Release(buffer); + IMFSample_Release(sample); }

1 0