February 2015 - Wine-Commits

Marcus Meissner : winex11.drv: Free uriList (Coverity).
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: ab854893aa68cb4878b36f86378f7a769c752b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab854893aa68cb4878b36f863… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 16 08:34:08 2015 +0100 winex11.drv: Free uriList (Coverity). --- dlls/winex11.drv/clipboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b2705b4..dad4a7a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1590,8 +1590,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato return 0; out = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(WCHAR)); - if (out == NULL) + if (out == NULL) { + HeapFree(GetProcessHeap(), 0, uriList); return 0; + } while (end < len) { @@ -1650,6 +1652,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato } } HeapFree(GetProcessHeap(), 0, out); + HeapFree(GetProcessHeap(), 0, uriList); return handle; }

1 0

Marcus Meissner : msi: Fix memory leak (Coverity).
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: c4bf8a85eea28f198e1ec8cc03fd6b7d0a2a12e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bf8a85eea28f198e1ec8cc0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 16 08:31:14 2015 +0100 msi: Fix memory leak (Coverity). --- dlls/msi/action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index afded69..ed09be7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6968,6 +6968,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) data = msi_alloc(size); if (!data) { + msi_free(deformatted); RegCloseKey(env); return ERROR_OUTOFMEMORY; }

1 0

Gerald Pfeifer : vbscript: Avoid use of uninitialized variable in Global_InStrRev().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 69a61383503c2c1ff55cefddae83c5f00b421c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a61383503c2c1ff55cefdda… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Feb 16 02:11:40 2015 +0100 vbscript: Avoid use of uninitialized variable in Global_InStrRev(). --- dlls/vbscript/global.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9bcd2b2..77fc1d6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1810,6 +1810,8 @@ static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, }else { start = SysStringLen(str1); } + } else { + str2 = NULL; } if(SUCCEEDED(hres)) {

1 0

Nikolay Sivov : wshom.ocx: Properly handle optional argument in Run().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: f0e2ea988e666533dd9f5ba1a6e68b2853dd0038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e2ea988e666533dd9f5ba1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 15 14:30:00 2015 +0300 wshom.ocx: Properly handle optional argument in Run(). --- dlls/wshom.ocx/shell.c | 43 +++++++++++++++++++++++------------------- dlls/wshom.ocx/tests/wshom.c | 32 ++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 09c7504..14eab75 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -912,14 +912,22 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *type return WshEnvironment_Create(env); } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) +static inline BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; - VARIANT s, w; + VARIANT s; HRESULT hr; - TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); + + if (!style || !wait || !exit_code) + return E_POINTER; VariantInit(&s); hr = VariantChangeType(&s, style, 0, VT_I4); @@ -929,19 +937,21 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, return hr; } - VariantInit(&w); - hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); - if (FAILED(hr)) - { - ERR("failed to convert wait argument, 0x%08x\n", hr); - return hr; + if (is_optional_argument(wait)) + waitforprocess = 0; + else { + VARIANT w; + + VariantInit(&w); + hr = VariantChangeType(&w, wait, 0, VT_I4); + if (FAILED(hr)) + return hr; + + waitforprocess = V_I4(&w); } memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - - waitforprocess = V_I4(&w); - info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; info.lpFile = cmd; info.nShow = V_I4(&s); @@ -955,16 +965,11 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { - if (exit_code) - { - DWORD code; - GetExitCodeProcess(info.hProcess, &code); - *exit_code = code; - } + GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); } else - if (exit_code) *exit_code = 0; + *exit_code = 0; return S_OK; } diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 4c3581e..b2e9859 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -33,6 +33,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static void test_wshshell(void) { + static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; @@ -51,8 +52,9 @@ static void test_wshshell(void) TYPEATTR *tattr; DISPPARAMS dp; EXCEPINFO ei; - VARIANT arg, res; + VARIANT arg, res, arg2; BSTR str, ret; + DWORD retval; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -171,6 +173,34 @@ static void test_wshshell(void) IWshEnvironment_Release(env); + V_VT(&arg) = VT_I2; + V_I2(&arg) = 0; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = DISP_E_PARAMNOTFOUND; + + str = SysAllocString(notepadW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + retval = 10; + hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = 0; + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 6255dc6..6647b2b 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -526,7 +526,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup( diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 02224a3..aade499 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup(

1 0

Jacek Caban : wininet: Use GetAddrInfoW in GetAddress.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 100bd11ae5e65bea9cdaecf4ce75a2aa8ba3ac2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=100bd11ae5e65bea9cdaecf4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:39 2015 +0100 wininet: Use GetAddrInfoW in GetAddress. --- dlls/wininet/utility.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index ec82779..16447e4 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -125,20 +125,12 @@ time_t ConvertTimeString(LPCWSTR asctime) } -BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr *psa, socklen_t *sa_len) +BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, socklen_t *sa_len) { - struct addrinfo *res, hints; - char *name; - int sz; + ADDRINFOW *res, hints; int ret; - TRACE("%s\n", debugstr_w(lpszServerName)); - - sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, NULL, 0, NULL, NULL ); - if (!(name = heap_alloc(sz + 1))) return FALSE; - WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, name, sz, NULL, NULL ); - name[sz] = 0; + TRACE("%s\n", debugstr_w(name)); memset( &hints, 0, sizeof(hints) ); /* Prefer IPv4 to IPv6 addresses, since some servers do not listen on @@ -146,23 +138,22 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, */ hints.ai_family = AF_INET; - ret = getaddrinfo( name, NULL, &hints, &res ); + ret = GetAddrInfoW(name, NULL, &hints, &res); if (ret != 0) { - TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(lpszServerName)); + TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(name)); hints.ai_family = AF_INET6; - ret = getaddrinfo( name, NULL, &hints, &res ); + ret = GetAddrInfoW(name, NULL, &hints, &res); } - heap_free( name ); if (ret != 0) { - TRACE("failed to get address of %s\n", debugstr_w(lpszServerName)); + TRACE("failed to get address of %s\n", debugstr_w(name)); return FALSE; } if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); - freeaddrinfo( res ); + FreeAddrInfoW(res); return FALSE; } *sa_len = res->ai_addrlen; @@ -171,14 +162,14 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, switch (res->ai_family) { case AF_INET: - ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); + ((struct sockaddr_in *)psa)->sin_port = htons(port); break; case AF_INET6: - ((struct sockaddr_in6 *)psa)->sin6_port = htons(nServerPort); + ((struct sockaddr_in6 *)psa)->sin6_port = htons(port); break; } - freeaddrinfo( res ); + FreeAddrInfoW(res); return TRUE; }

1 0

Mark Harmstone : comctl32: Draw focus rect on themed pushbuttons.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 18c41f7128522d3f3c50baf76c3653a970ef7dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c41f7128522d3f3c50baf76… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Feb 15 14:23:35 2015 +0000 comctl32: Draw focus rect on themed pushbuttons. --- dlls/comctl32/theme_button.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 3935333..9b0a5cf 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -122,6 +122,21 @@ static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN HeapFree(GetProcessHeap(), 0, text); } + if (focused) + { + MARGINS margins; + RECT focusRect = bgRect; + + GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); + + focusRect.left += margins.cxLeftWidth; + focusRect.top += margins.cyTopHeight; + focusRect.right -= margins.cxRightWidth; + focusRect.bottom -= margins.cyBottomHeight; + + DrawFocusRect( hDC, &focusRect ); + } + if (hPrevFont) SelectObject(hDC, hPrevFont); }

1 0

Nikolay Sivov : vbscript: Fix potential crash if script site creation failed.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: dba0fe3614b2bf8002551a7636cc90c7315e2c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba0fe3614b2bf8002551a763… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 16 11:30:11 2015 +0300 vbscript: Fix potential crash if script site creation failed. --- dlls/vbscript/global.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 77fc1d6..448b886 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -209,11 +209,12 @@ static HRESULT set_object_site(script_ctx_t *ctx, IUnknown *obj) return S_OK; ax_site = create_ax_site(ctx); - if(ax_site) + if(ax_site) { hres = IObjectWithSite_SetSite(obj_site, ax_site); + IUnknown_Release(ax_site); + } else hres = E_OUTOFMEMORY; - IUnknown_Release(ax_site); IObjectWithSite_Release(obj_site); return hres; }

1 0

André Hentschel : Add WWN 385
by Jeremy Newman Feb. 13, 2015

Feb. 13, 2015

Module: website Branch: master Commit: 343e6dc82aacf00d03a8cbc03147753130946523 URL: http://source.winehq.org/git/website.git/?a=commit;h=343e6dc82aacf00d03a8cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 13 14:37:25 2015 +0100 Add WWN 385 --- news/de/2015021301.xml | 10 + news/en/2015021301.xml | 10 + wwn/en/wn20150213_385.xml | 596 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 616 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=343e6dc82aacf00d03…

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.DriverVersion.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: f455806f12b2917f9b8d25ddb80095ed06c7c162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f455806f12b2917f9b8d25ddb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:40:09 2015 +0100 wbemprox: Implement Win32_VideoController.DriverVersion. --- dlls/wbemprox/builtin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7c22ad8..6b65c35 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -160,6 +160,8 @@ static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +static const WCHAR prop_driverversionW[] = + {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_familyW[] = @@ -542,6 +544,7 @@ static const struct column col_videocontroller[] = { prop_currentverticalresW, CIM_UINT32, VT_I4 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driverversionW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -637,6 +640,8 @@ static const WCHAR videocontroller_dactypeW[] = {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; +static const WCHAR videocontroller_driverversionW[] = + {'1','.','0',0}; #include "pshpack1.h" struct record_baseboard @@ -877,6 +882,7 @@ struct record_videocontroller UINT32 current_verticalres; const WCHAR *description; const WCHAR *device_id; + const WCHAR *driverversion; const WCHAR *name; const WCHAR *pnpdevice_id; const WCHAR *videoprocessor; @@ -2479,6 +2485,7 @@ done: rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; + rec->driverversion = videocontroller_driverversionW; rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); rec->videoprocessor = heap_strdupW( name );

1 0

Henri Verbeet : dxgi: Implement dxgi_factory_SetPrivateData().
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 49ad383e89a11c951c458f7d3c0ae1edf118c240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ad383e89a11c951c458f7d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:52 2015 +0100 dxgi: Implement dxgi_factory_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 6653c21..45f2404 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -88,6 +88,7 @@ struct dxgi_factory { IDXGIFactory1 IDXGIFactory1_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d *wined3d; UINT adapter_count; IDXGIAdapter1 **adapters; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 1e22f6f..13b72f0 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -83,6 +83,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) EnterCriticalSection(&dxgi_cs); wined3d_decref(factory->wined3d); LeaveCriticalSection(&dxgi_cs); + wined3d_private_store_cleanup(&factory->private_store); HeapFree(GetProcessHeap(), 0, factory); } @@ -92,9 +93,11 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory1 *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&factory->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory1 *iface, @@ -284,12 +287,14 @@ static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) factory->IDXGIFactory1_iface.lpVtbl = &dxgi_factory_vtbl; factory->refcount = 1; + wined3d_private_store_init(&factory->private_store); EnterCriticalSection(&dxgi_cs); factory->wined3d = wined3d_create(0); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); + wined3d_private_store_cleanup(&factory->private_store); return DXGI_ERROR_UNSUPPORTED; } @@ -346,6 +351,7 @@ fail: EnterCriticalSection(&dxgi_cs); wined3d_decref(factory->wined3d); LeaveCriticalSection(&dxgi_cs); + wined3d_private_store_cleanup(&factory->private_store); return hr; }

1 0