December 2012 - Wine-commits

Andrew Talbot : mountmgr.sys: Remove superfluous semicolon.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 1cff1145b01d1621a0a82abe1fa3524aa4a77ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cff1145b01d1621a0a82abe1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 8 18:36:25 2012 +0000 mountmgr.sys: Remove superfluous semicolon. --- dlls/mountmgr.sys/dbus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 0384c29..7e373e6 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -72,7 +72,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); DO_FUNC(dbus_message_iter_next); \ DO_FUNC(dbus_message_iter_recurse); \ DO_FUNC(dbus_message_new_method_call); \ - DO_FUNC(dbus_message_unref); + DO_FUNC(dbus_message_unref) #define DO_FUNC(f) static typeof(f) * p_##f DBUS_FUNCS;

1 0

Nikolay Sivov : oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 25e996bd6c3b50421d0bd9caa4f5c7f08aa7a86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e996bd6c3b50421d0bd9caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 13:57:03 2012 +0400 oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup. --- dlls/oledb32/datainit.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index a191c88..78a005d 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -351,10 +351,9 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) int p; for (p = 0; p < propset[i].cProperties; p++) - { VariantClear(&propset[i].rgProperties[p].vValue); - CoTaskMemFree(&propset[i].rgProperties[p]); - } + + CoTaskMemFree(propset[i].rgProperties); } CoTaskMemFree(propset); } @@ -368,10 +367,9 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) int p; for (p = 0; p < propinfoset[i].cPropertyInfos; p++) - { VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); - CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]); - } + + CoTaskMemFree(propinfoset[i].rgPropertyInfos); } CoTaskMemFree(propinfoset); }

1 0

Nikolay Sivov : oleaut32: Use correct allocation length (Coverity).
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 61ad275e82bf38248e7de2fb7131a65f94213712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ad275e82bf38248e7de2fb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 14:21:12 2012 +0400 oleaut32: Use correct allocation length (Coverity). --- dlls/oleaut32/recinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index f6f5653..04cd377 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -616,7 +616,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ret->name = NULL; } - ret->fields = HeapAlloc(GetProcessHeap(), 0, ret->n_vars*sizeof(VARDESC)); + ret->fields = HeapAlloc(GetProcessHeap(), 0, ret->n_vars*sizeof(fieldstr)); for(i = 0; i<ret->n_vars; i++) { VARDESC *vardesc; hres = ITypeInfo_GetVarDesc(pTypeInfo, i, &vardesc);

1 0

Nikolay Sivov : msi: Fix a stream data leak on error (Coverity).
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: af5e73572a15e28d1a7204a142464a5ef5246987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5e73572a15e28d1a7204a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 16:08:57 2012 +0400 msi: Fix a stream data leak on error (Coverity). --- dlls/msi/streams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index d9d632f..a20f196 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -200,6 +200,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U if (FAILED(hr)) { WARN("failed to open stream: %08x\n", hr); + msi_free(stream); goto done; }

1 0

Nikolay Sivov : comctl32: Fix a ranges leak on error.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 9ed808e340cd7aa1e36993b0d55f751335896e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed808e340cd7aa1e36993b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 20:25:06 2012 +0400 comctl32: Fix a ranges leak on error. --- dlls/comctl32/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4bac508..918faa8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4954,6 +4954,8 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) SelectObject( hdc, hOldPen ); DeleteObject( hPen ); } + else + ranges_destroy(colRanges); } /***

1 0

Nikolay Sivov : comctl32: Initialize id field for message tests.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 3938bfd30d5ca960bc1067d3780139cc3fb6a368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3938bfd30d5ca960bc1067d37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 20:38:27 2012 +0400 comctl32: Initialize id field for message tests. --- dlls/comctl32/tests/datetime.c | 1 + dlls/comctl32/tests/header.c | 1 + dlls/comctl32/tests/listview.c | 1 + dlls/comctl32/tests/monthcal.c | 1 + dlls/comctl32/tests/syslink.c | 1 + dlls/comctl32/tests/tab.c | 2 ++ dlls/comctl32/tests/trackbar.c | 1 + dlls/comctl32/tests/treeview.c | 6 +++++- dlls/comctl32/tests/updown.c | 1 + 9 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 24d339f..ece61b4 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -147,6 +147,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, DATETIME_SEQ_INDEX, &msg); defwndproc_counter++; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 08d5065..9b4d14f 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -409,6 +409,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, HEADER_SEQ_INDEX, &msg); defwndproc_counter++; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 255ef50..6c39c2d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -626,6 +626,7 @@ static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wPar if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; /* all we need is sizing */ if (message == WM_WINDOWPOSCHANGING || diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 1fed831..c7fd1e5 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -588,6 +588,7 @@ static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wPa if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, MONTHCAL_SEQ_INDEX, &msg); /* some debug output for style changing */ diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index ea92d42..26bd924 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -155,6 +155,7 @@ static LRESULT WINAPI syslink_subclass_proc(HWND hwnd, UINT message, WPARAM wPar if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, SYSLINK_SEQ_INDEX, &msg); defwndproc_counter++; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 51a8a91..e3d06a3 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -352,6 +352,7 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -419,6 +420,7 @@ static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam, if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, TAB_SEQ_INDEX, &msg); } diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7a0e398..17e8bb6 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -442,6 +442,7 @@ static LRESULT WINAPI trackbar_subclass_proc(HWND hwnd, UINT message, WPARAM wPa if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, TRACKBAR_SEQ_INDEX, &msg); defwndproc_counter++; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2fe468b..4a7c60c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -292,6 +292,7 @@ static LRESULT WINAPI TreeviewWndProc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, TREEVIEW_SEQ_INDEX, &msg); defwndproc_counter++; @@ -1001,7 +1002,10 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + msg.id = ((NMHDR*)lParam)->code; + else + msg.id = 0; /* log system messages, except for painting */ if (message < WM_USER && diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index e2a640f..24d1a6a 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -186,6 +186,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); }

1 0

Henri Verbeet : ddraw: Avoid LPDDCOLORCONTROL.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 533dbc4353f201f415e41d9829a56a481e3b1045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533dbc4353f201f415e41d982… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:03 2012 +0100 ddraw: Avoid LPDDCOLORCONTROL. --- include/ddraw.h | 4 ++-- include/ddrawi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 0b8128f..28d53ae 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -2660,8 +2660,8 @@ DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawColorControl methods ***/ - STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE; - STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE; + STDMETHOD(GetColorControls)(THIS_ DDCOLORCONTROL *color_control) PURE; + STDMETHOD(SetColorControls)(THIS_ DDCOLORCONTROL *color_control) PURE; }; #undef INTERFACE diff --git a/include/ddrawi.h b/include/ddrawi.h index 5422ed7..e7f4099 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -906,7 +906,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE { DWORD cPageUnlocks; ULONG_PTR hKernelSurface; DWORD dwKernelRefCnt; - LPDDCOLORCONTROL lpColorInfo; + DDCOLORCONTROL *lpColorInfo; FLATPTR fpNTAlias; DWORD dwContentsStamp; LPVOID lpvUnswappedDriverReserved;

1 0

Henri Verbeet : ddraw: Avoid LPDDGAMMARAMP.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: b00ac5072a15f982b9cc5cf9cb303feeebaafa4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00ac5072a15f982b9cc5cf9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:04 2012 +0100 ddraw: Avoid LPDDGAMMARAMP. --- include/ddraw.h | 4 ++-- include/ddrawi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 28d53ae..5f08c89 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -2694,8 +2694,8 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawGammaControl methods ***/ - STDMETHOD(GetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE; - STDMETHOD(SetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE; + STDMETHOD(GetGammaRamp)(THIS_ DWORD flags, DDGAMMARAMP *gamma_ramp) PURE; + STDMETHOD(SetGammaRamp)(THIS_ DWORD flags, DDGAMMARAMP *gamma_ramp) PURE; }; #undef INTERFACE diff --git a/include/ddrawi.h b/include/ddrawi.h index e7f4099..016e3ea 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -432,7 +432,7 @@ typedef struct _DDHAL_DDMISCELLANEOUS2CALLBACKS { LPDDHAL_DESTROYDDLOCAL DestroyDDLocal; } DDHAL_DDMISCELLANEOUS2CALLBACKS,*LPDDHAL_DDMISCELLANEOUS2CALLBACKS; -typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE); +typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(DDGAMMARAMP *, BYTE *); /***************************************************************************** * driver info structure

1 0

Henri Verbeet : ddraw: Avoid LPDDOVERLAYFX.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 5cea0f122c0de10bad781286568b9e38c5c5ac94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cea0f122c0de10bad7812865… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:05 2012 +0100 ddraw: Avoid LPDDOVERLAYFX. --- dlls/ddrawex/surface.c | 4 ++-- include/ddrawi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 119e401..5bd2bd0 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -794,8 +794,8 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_UpdateOverlay(IDirectDrawSurface4 } static HRESULT WINAPI IDirectDrawSurface3Impl_UpdateOverlay(IDirectDrawSurface3 *iface, - LPRECT SrcRect, IDirectDrawSurface3 *DstSurface, LPRECT DstRect, DWORD Flags, - LPDDOVERLAYFX FX) + RECT *SrcRect, IDirectDrawSurface3 *DstSurface, RECT *DstRect, DWORD Flags, + DDOVERLAYFX *FX) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); IDirectDrawSurfaceImpl *Dst = unsafe_impl_from_IDirectDrawSurface3(DstSurface); diff --git a/include/ddrawi.h b/include/ddrawi.h index 016e3ea..761d970 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -936,7 +936,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD dwOverlayFlags; VOID *rgjunc; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDOVERLAYFX lpddOverlayFX; + DDOVERLAYFX *lpddOverlayFX; DDSCAPSEX ddsCapsEx; DWORD dwTextureStage; LPVOID lpDDRAWReserved;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSSetSamplers().
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 4c4131cd78af3fa779afbecd4e0d1a322f2c6354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4131cd78af3fa779afbecd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:06 2012 +0100 d3d10core: Implement d3d10_device_PSSetSamplers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 138f3e4..8944491 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -153,8 +153,19 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler = unsafe_impl_from_ID3D10SamplerState(samplers[i]); + + wined3d_device_set_ps_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9cd280..c74498a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3052,6 +3052,27 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi return device->stateBlock->state.ps_cb[idx]; } +void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +{ + struct wined3d_sampler *prev; + + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.ps_sampler[idx]; + device->updateStateBlock->state.ps_sampler[idx] = sampler; + + if (sampler) + wined3d_sampler_incref(sampler); + if (prev) + wined3d_sampler_decref(prev); +} + HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 45118f4..10104e1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -570,6 +570,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) + { + if ((sampler = state->ps_sampler[i])) + { + state->ps_sampler[i] = NULL; + wined3d_sampler_decref(sampler); + } + } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) { if ((buffer = state->ps_cb[i])) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8c58563..231b958 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -134,6 +134,7 @@ @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_render_target(ptr long ptr long) @ cdecl wined3d_device_set_sampler_state(ptr long long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64da8e5..9830e8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2319,6 +2319,7 @@ struct wined3d_state struct wined3d_shader *pixel_shader; struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; + struct wined3d_sampler *ps_sampler[MAX_SAMPLER_OBJECTS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; float *ps_consts_f; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0e955ce..2dd9a1a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2231,6 +2231,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, UINT start_register, const float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); +void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device,

1 0