August 2013 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Fix parameter validation in _stat64 function.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 024ece50e8a42b62800f899343b8330b5d831e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024ece50e8a42b62800f89934… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 26 13:29:27 2013 +0200 msvcrt: Fix parameter validation in _stat64 function. --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0054222..1594c33 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2684,7 +2684,8 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) while (plen && path[plen-1]==' ') plen--; - if (plen && (path[plen-1]=='\\' || path[plen-1]=='/')) + if (plen && (plen<2 || path[plen-2]!=':') && + (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; @@ -2784,7 +2785,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu while (plen && path[plen-1]==' ') plen--; - if(plen && (path[plen-1]=='\\' || path[plen-1]=='/')) + if(plen && (plen<2 || path[plen-2]!=':') && + (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7a3253a..2d2399a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1907,6 +1907,16 @@ static void test_stat(void) } else skip("mkdir failed with errno %d\n", errno); + + errno = 0xdeadbeef; + ret = stat("c:", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); + + ret = stat("c:/", &buf); + ok(!ret, "stat returned %d\n", ret); + ok(buf.st_dev == 2, "st_dev = %d\n", buf.st_dev); + ok(buf.st_rdev == 2, "st_rdev = %d\n", buf.st_rdev); } static const char* pipe_string="Hello world";

1 0

Aric Stewart : wineps.drv: Remove unnecessary changes included with vertical font work.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 72b78e7a0a78eb066c593d044fb3257c1258cee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b78e7a0a78eb066c593d044… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 26 09:52:21 2013 -0500 wineps.drv: Remove unnecessary changes included with vertical font work. --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/download.c | 2 +- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 23219b9..e2106d3 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -238,7 +238,7 @@ BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); return PSDRV_WriteSetFont(dev, physDev->font.fontinfo.Builtin.afm->FontName, - physDev->font.size, physDev->font.escapement, FALSE, FALSE); + physDev->font.size, physDev->font.escapement, FALSE); } BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 6290872..f476843 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -353,7 +353,7 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) escapement += 900; PSDRV_WriteSetFont(dev, ps_name, physDev->font.size, escapement, - is_fake_italic( dev->hdc ), (lf.lfFaceName[0] == '@')); + is_fake_italic( dev->hdc )); HeapFree(GetProcessHeap(), 0, ps_name); HeapFree(GetProcessHeap(), 0, potm); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index ea6c530..6187223 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -571,7 +571,7 @@ BOOL PSDRV_WriteCurveTo(PHYSDEV dev, POINT pts[3]) return PSDRV_WriteSpool(dev, buf, strlen(buf)); } -BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, BOOL fake_italic, BOOL vertical) +BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, BOOL fake_italic) { char *buf; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index f410e2a..229d04c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -500,7 +500,7 @@ extern BOOL PSDRV_WriteStroke(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRectangle(PHYSDEV dev, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRRectangle(PHYSDEV dev, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, - BOOL fake_italic, BOOL vertical) DECLSPEC_HIDDEN; + BOOL fake_italic) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteGlyphShow(PHYSDEV dev, LPCSTR g_name) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetPen(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArc(PHYSDEV dev, INT x, INT y, INT w, INT h,

1 0

Detlef Riekenberg : comdlg32/tests: Limit the number of copies to avoid a test hang.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 9a7d510ccb2ffc232f56192f89b52ae2fd0ccf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7d510ccb2ffc232f56192f8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 23 19:08:44 2013 +0200 comdlg32/tests: Limit the number of copies to avoid a test hang. --- dlls/comdlg32/tests/printdlg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 83be893..d0b0443 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -128,7 +128,9 @@ static UINT_PTR CALLBACK print_hook_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM { if (msg == WM_INITDIALOG) { - SetDlgItemInt(hdlg, edt3, 1234, FALSE); + /* some driver popup a dialog and hung the test or silently limit the number of copies, + when trying to set more than 999 copies */ + SetDlgItemInt(hdlg, edt3, 123, FALSE); PostMessage(hdlg, WM_COMMAND, IDOK, FALSE); } return 0; @@ -252,7 +254,7 @@ static void test_PrintDlgA(void) /* Version of Microsoft XPS Document Writer driver shipped before Win7 * reports that it can print multiple copies, but returns 1. */ - ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); + ok(pDlg->nCopies == 123 || broken(pDlg->nCopies == 1), "expected nCopies 123, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); ok(S1(U1(*dm)).dmCopies == 1, "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); @@ -269,7 +271,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(S1(U1(*dm)).dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", S1(U1(*dm)).dmCopies); + ok(S1(U1(*dm)).dmCopies == 123, "expected dm->dmCopies 123, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);

1 0

Alistair Leslie-Hughes : comsvcs: Add stub dll.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 04bf2009aacbcbbf193154cd71992ce605a0882b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bf2009aacbcbbf193154cd7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 10:19:23 2013 +1000 comsvcs: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/comsvcs/Makefile.in | 8 ++++ dlls/comsvcs/comsvcs.spec | 20 +++++++++++ dlls/comsvcs/main.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ddf79be..793f5a1 100755 --- a/configure +++ b/configure @@ -16053,6 +16053,7 @@ wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib +wine_fn_config_dll comsvcs enable_comsvcs implib wine_fn_config_dll credui enable_credui implib,po wine_fn_config_test dlls/credui/tests credui_test wine_fn_config_dll crtdll enable_crtdll implib diff --git a/configure.ac b/configure.ac index 1cba660..0f84770 100644 --- a/configure.ac +++ b/configure.ac @@ -2641,6 +2641,7 @@ WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) +WINE_CONFIG_DLL(comsvcs,,[implib]) WINE_CONFIG_DLL(credui,,[implib,po]) WINE_CONFIG_TEST(dlls/credui/tests) WINE_CONFIG_DLL(crtdll,,[implib]) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in new file mode 100644 index 0000000..1e52806 --- /dev/null +++ b/dlls/comsvcs/Makefile.in @@ -0,0 +1,8 @@ +MODULE = comsvcs.dll +IMPORTLIB = comsvcs +IMPORTS = ole32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/comsvcs/comsvcs.spec b/dlls/comsvcs/comsvcs.spec new file mode 100644 index 0000000..6bd6ec9 --- /dev/null +++ b/dlls/comsvcs/comsvcs.spec @@ -0,0 +1,20 @@ +@ stub CosGetCallContext +@ stub CoCreateActivity +@ stub CoEnterServiceDomain +@ stub CoLeaveServiceDomain +@ stub CoLoadServices +@ stub ComSvcsExceptionFilter +@ stub ComSvcsLogError +@ stub DispManGetContext +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub GetMTAThreadPoolMetrics +@ stub GetManagedExtensions +@ stub GetObjectContext +@ stub GetTrkSvrObject +@ stub MTSCreateActivity +@ stub MiniDumpW +@ stub RecycleSurrogate +@ stub SafeRef diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c new file mode 100644 index 0000000..3fc69de --- /dev/null +++ b/dlls/comsvcs/main.c @@ -0,0 +1,84 @@ +/* + * COM+ Services + * + * Copyright 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + +static HINSTANCE COMSVCS_hInstance; + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + COMSVCS_hInstance = hinst; + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (comsvcs.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( COMSVCS_hInstance ); +} + +/*********************************************************************** + * DllUnregisterServer (comsvcs.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( COMSVCS_hInstance ); +}

1 0

Nikolay Sivov : ole32/tests: Test for OleRegGetMiscStatus() redirection behaviour.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 15bc45a54cf1e5f02125e21973b6346871dccd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bc45a54cf1e5f02125e2197… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 25 21:16:25 2013 +0400 ole32/tests: Test for OleRegGetMiscStatus() redirection behaviour. --- dlls/ole32/tests/compobj.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5f5ab77..c81a017 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -220,9 +220,12 @@ static const char actctx_manifest[] = " <comClass description=\"Test com class\"" " clsid=\"{12345678-1234-1234-1234-56789abcdef0}\"" " progid=\"ProgId.ProgId\"" +" miscStatusIcon=\"recomposeonresize\"" " />" " <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" " progid=\"CustomFont\"" +" miscStatusIcon=\"recomposeonresize\"" +" miscStatusContent=\"insideout\"" " />" " <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" @@ -230,6 +233,8 @@ static const char actctx_manifest[] = "</file>" "</assembly>"; +DEFINE_GUID(CLSID_Testclass, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); + static void test_ProgIDFromCLSID(void) { ULONG_PTR cookie = 0; @@ -1720,6 +1725,30 @@ static void test_CoInitializeEx(void) OleUninitialize(); } +static void test_OleRegGetMiscStatus(void) +{ + ULONG_PTR cookie; + HANDLE handle; + DWORD status; + HRESULT hr; + + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); + ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + + if ((handle = activate_context(actctx_manifest, &cookie))) + { + + status = 0; + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); +} + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -1771,4 +1800,5 @@ START_TEST(compobj) test_CoGetContextToken(); test_CoGetTreatAsClass(); test_CoInitializeEx(); + test_OleRegGetMiscStatus(); }

1 0

Alexandre Julliard : iphlpapi: Fix some memory leaks.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: fc36c5eb5d2795d8e4a8639896cce6aac18e0600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc36c5eb5d2795d8e4a863989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 17:32:03 2013 +0200 iphlpapi: Fix some memory leaks. --- dlls/iphlpapi/ipstats.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 962d421..809dbc6 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2197,7 +2197,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE size_t Len = 0; char *Buf = NULL; struct xinpgen *pXIG, *pOrigXIG; - struct pid_map *pMap; + struct pid_map *pMap = NULL; unsigned NumEntries; if (sysctlbyname ("net.inet.tcp.pcblist", NULL, &Len, NULL, 0) < 0) @@ -2280,6 +2280,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE } done: + HeapFree( GetProcessHeap(), 0, pMap ); HeapFree (GetProcessHeap (), 0, Buf); } #else @@ -2471,7 +2472,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE size_t Len = 0; char *Buf = NULL; struct xinpgen *pXIG, *pOrigXIG; - struct pid_map *pMap; + struct pid_map *pMap = NULL; unsigned NumEntries; if (sysctlbyname ("net.inet.udp.pcblist", NULL, &Len, NULL, 0) < 0) @@ -2547,6 +2548,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE } done: + HeapFree( GetProcessHeap(), 0, pMap ); HeapFree (GetProcessHeap (), 0, Buf); } #else

1 0

Stefan Dösinger : wined3d: Enforce volume mapping restrictions.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 421b7a17adbb06924332a25e959319d68323e18d URL: http://source.winehq.org/git/wine.git/?a=commit;h=421b7a17adbb06924332a25e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:26 2013 +0200 wined3d: Enforce volume mapping restrictions. --- dlls/d3dx9_36/tests/volume.c | 2 +- dlls/wined3d/volume.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index f3976c0..eb2877f 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -184,7 +184,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) set_box(&src_box, 0, 0, 4, 1, 0, 4); set_box(&dst_box, 0, 0, 4, 1, 0, 4); hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); IDirect3DVolume9_Release(volume); IDirect3DVolumeTexture9_Release(volume_texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 71b2937..0369f54 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -373,6 +373,13 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); + if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) + { + WARN("Volume %p is not CPU accessible.\n", volume); + map_desc->data = NULL; + return WINED3DERR_INVALIDCALL; + } + if (!volume_prepare_system_memory(volume)) { WARN("Out of memory.\n");

1 0

Henri Verbeet : wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: f02a5f45d46cc58449504c41e6f08a061918c5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02a5f45d46cc58449504c41e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:37 2013 +0200 wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field. --- dlls/wined3d/device.c | 295 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 8 +- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 152 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f02a5f45d46cc58449504…

1 0

Henri Verbeet : wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 4e755d263f65b571e34c851c803b0216ed886af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e755d263f65b571e34c851c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:38 2013 +0200 wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 5 ++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0becf8..a0db7c7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1285,7 +1285,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (device->logo_surface) wined3d_surface_decref(device->logo_surface); - stateblock_unbind_resources(device->stateBlock); + state_unbind_resources(&device->stateBlock->state); /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) @@ -4917,7 +4917,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (reset_state) - stateblock_unbind_resources(device->stateBlock); + state_unbind_resources(&device->stateBlock->state); if (device->fb.render_targets) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e6a867a..3685a2e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -467,9 +467,8 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock) return refcount; } -void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) +void state_unbind_resources(struct wined3d_state *state) { - struct wined3d_state *state = &stateblock->state; struct wined3d_vertex_declaration *decl; struct wined3d_sampler *sampler; struct wined3d_texture *texture; @@ -599,7 +598,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { int counter; - stateblock_unbind_resources(stateblock); + state_unbind_resources(&stateblock->state); for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a586f91..e0ceb7e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2446,7 +2446,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void stateblock_init_default_state(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; -void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; + +void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d

1 0

Henri Verbeet : wined3d: Introduce a separate function for cleaning up a wined3d_state structure.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: aee3c0faeb743b6f1b797f508a602fcb622e2e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee3c0faeb743b6f1b797f508… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:39 2013 +0200 wined3d: Introduce a separate function for cleaning up a wined3d_state structure. --- dlls/wined3d/stateblock.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3685a2e..8abd8e5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -588,6 +588,27 @@ void state_unbind_resources(struct wined3d_state *state) } } +static void state_cleanup(struct wined3d_state *state) +{ + unsigned int counter; + + state_unbind_resources(state); + + for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) + { + struct list *e1, *e2; + LIST_FOR_EACH_SAFE(e1, e2, &state->light_map[counter]) + { + struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); + list_remove(&light->entry); + HeapFree(GetProcessHeap(), 0, light); + } + } + + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + HeapFree(GetProcessHeap(), 0, state->ps_consts_f); +} + ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -596,24 +617,9 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { - int counter; - - state_unbind_resources(&stateblock->state); - - for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) - { - struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &stateblock->state.light_map[counter]) - { - struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); - list_remove(&light->entry); - HeapFree(GetProcessHeap(), 0, light); - } - } + state_cleanup(&stateblock->state); - HeapFree(GetProcessHeap(), 0, stateblock->state.vs_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->changed.vertexShaderConstantsF); - HeapFree(GetProcessHeap(), 0, stateblock->state.ps_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->changed.pixelShaderConstantsF); HeapFree(GetProcessHeap(), 0, stateblock->contained_vs_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->contained_ps_consts_f);

1 0