February 2015 - Wine-commits

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

16 Feb '15

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

Mark Harmstone : comctl32: Add themed scrollbar stub.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: ca5184f512a4e70a8c966cf54914025824b521f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5184f512a4e70a8c966cf54… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Feb 15 16:10:10 2015 +0000 comctl32: Add themed scrollbar stub. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/theme_scrollbar.c | 44 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/theming.c | 9 +++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index e63f0ac..27f9741 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -35,6 +35,7 @@ C_SRCS = \ theme_dialog.c \ theme_edit.c \ theme_listbox.c \ + theme_scrollbar.c \ theming.c \ toolbar.c \ tooltips.c \ diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c new file mode 100644 index 0000000..9978598 --- /dev/null +++ b/dlls/comctl32/theme_scrollbar.c @@ -0,0 +1,44 @@ +/* + * Theming - Scrollbar control + * + * Copyright (c) 2015 Mark Harmstone + * + * 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 + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "vssym32.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); + +LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); + + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); +} diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index aa99fc1..93d6fe6 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -44,6 +44,8 @@ extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; +extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; @@ -59,7 +61,8 @@ static const struct ThemingSubclass {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, {WC_EDITW, THEMING_EditSubclassProc}, - {WC_LISTBOXW, THEMING_ListBoxSubclassProc} + {WC_LISTBOXW, THEMING_ListBoxSubclassProc}, + {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; #define NUM_SUBCLASSES (sizeof(subclasses)/sizeof(subclasses[0])) @@ -95,6 +98,7 @@ MAKE_SUBCLASS_PROC(2) MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) MAKE_SUBCLASS_PROC(5) +MAKE_SUBCLASS_PROC(6) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, @@ -102,7 +106,8 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc2, subclass_proc3, subclass_proc4, - subclass_proc5 + subclass_proc5, + subclass_proc6 }; /***********************************************************************

1 0

Mark Harmstone : comctl32: Use theming when drawing IP address control.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 6f9724d581b0b09b66a829346cf67eb5dfb7efe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9724d581b0b09b66a829346… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Feb 12 23:29:03 2015 +0000 comctl32: Use theming when drawing IP address control. --- dlls/comctl32/ipaddress.c | 57 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 97b6a0f..98e7259 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -45,6 +45,9 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" +#include "uxtheme.h" +#include "vsstyle.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -150,36 +153,64 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; COLORREF bgCol, fgCol; - int i; + HTHEME theme; + int i, state = ETS_NORMAL; TRACE("\n"); GetClientRect (infoPtr->Self, &rect); - if (infoPtr->Enabled) { - bgCol = comctl32_color.clrWindow; - fgCol = comctl32_color.clrWindowText; + theme = OpenThemeData(infoPtr->Self, WC_EDITW); + + if (theme) { + DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE); + + if (!infoPtr->Enabled) + state = ETS_DISABLED; + else if (dwStyle & ES_READONLY) + state = ETS_READONLY; + else if (GetFocus() == infoPtr->Self) + state = ETS_FOCUSED; + + GetThemeColor(theme, EP_EDITTEXT, state, TMT_FILLCOLOR, &bgCol); + GetThemeColor(theme, EP_EDITTEXT, state, TMT_TEXTCOLOR, &fgCol); + + if (IsThemeBackgroundPartiallyTransparent (theme, EP_EDITTEXT, state)) + DrawThemeParentBackground(infoPtr->Self, hdc, &rect); + DrawThemeBackground (theme, hdc, EP_EDITTEXT, state, &rect, 0); } else { - bgCol = comctl32_color.clr3dFace; - fgCol = comctl32_color.clrGrayText; + if (infoPtr->Enabled) { + bgCol = comctl32_color.clrWindow; + fgCol = comctl32_color.clrWindowText; + } else { + bgCol = comctl32_color.clr3dFace; + fgCol = comctl32_color.clrGrayText; + } + + FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); + DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); } - FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); - DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - SetBkColor (hdc, bgCol); SetTextColor(hdc, fgCol); for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); - rect.left = rcPart.right; - GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); + rect.left = rcPart.right; + GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); - rect.right = rcPart.left; - DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); + rect.right = rcPart.left; + + if (theme) + DrawThemeText(theme, hdc, EP_EDITTEXT, state, dotW, 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); + else + DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); } + if (theme) + CloseThemeData(theme); + return 0; }

1 0

Mark Harmstone : comctl32: Redraw themed editboxes on focus change.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 707361321a9202cc5ca773e22ad5370583025da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707361321a9202cc5ca773e22… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 13 00:33:55 2015 +0000 comctl32: Redraw themed editboxes on focus change. --- dlls/comctl32/theme_edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c index c6fd34c..ff4e56c 100644 --- a/dlls/comctl32/theme_edit.c +++ b/dlls/comctl32/theme_edit.c @@ -119,6 +119,8 @@ LRESULT CALLBACK THEMING_EditSubclassProc (HWND hwnd, UINT msg, break; case WM_ENABLE: + case WM_KILLFOCUS: + case WM_SETFOCUS: theme = GetWindowTheme( hwnd ); if (theme) RedrawWindow (hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);

1 0

Mark Harmstone : comctl32: Fix graphical error on themed progress bars.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 50c2144999a70ecbfaeeff39ffd2cab97050029d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c2144999a70ecbfaeeff39f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Feb 15 20:07:06 2015 +0000 comctl32: Fix graphical error on themed progress bars. --- dlls/comctl32/progress.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 44fdd3f..1b8fcf7 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -280,23 +280,33 @@ static void draw_theme_bar_V (const ProgressDrawInfo* di, int start, int end) /* draw themed horizontal background from 'start' to 'end' */ static void draw_theme_bkg_H (const ProgressDrawInfo* di, int start, int end) { - RECT r; + RECT bgrect, r; + r.left = di->rect.left + start; r.top = di->rect.top; r.right = di->rect.left + end; r.bottom = di->rect.bottom; - DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &di->bgRect, &r); + + bgrect = di->bgRect; + OffsetRect(&bgrect, -bgrect.left, -bgrect.top); + + DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &bgrect, &r); } /* draw themed vertical background from 'start' to 'end' */ static void draw_theme_bkg_V (const ProgressDrawInfo* di, int start, int end) { - RECT r; + RECT bgrect, r; + r.left = di->rect.left; r.top = di->rect.bottom - end; r.right = di->rect.right; r.bottom = di->rect.bottom - start; - DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &di->bgRect, &r); + + bgrect = di->bgRect; + OffsetRect(&bgrect, -bgrect.left, -bgrect.top); + + DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &bgrect, &r); } /* drawing functions for themed style */

1 0

Jacek Caban : wininet: Don' t strip port part from server name in GetAddress.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 11d09f1fe7be3b418ffc669bb60b79049f90d6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d09f1fe7be3b418ffc669bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:16 2015 +0100 wininet: Don't strip port part from server name in GetAddress. Callers take care of that already. --- dlls/wininet/utility.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 871db1b..ec82779 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -129,27 +129,15 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) { struct addrinfo *res, hints; - WCHAR *found; char *name; - int len, sz; + int sz; int ret; TRACE("%s\n", debugstr_w(lpszServerName)); - /* Validate server name first - * Check if there is something like - * pinger.macromedia.com:80 - * if yes, eliminate the :80.... - */ - found = strchrW(lpszServerName, ':'); - if (found) - len = found - lpszServerName; - else - len = strlenW(lpszServerName); - - sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); + sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, NULL, 0, NULL, NULL ); if (!(name = heap_alloc(sz + 1))) return FALSE; - WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); + WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, name, sz, NULL, NULL ); name[sz] = 0; memset( &hints, 0, sizeof(hints) );

1 0

Jacek Caban : wininet: Use GetAddrInfoW in GetAddress.
by Alexandre Julliard 16 Feb '15

16 Feb '15

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

André Hentschel : Add WWN 385
by Jeremy Newman 13 Feb '15

13 Feb '15

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

Henri Verbeet : dxgi: Implement dxgi_adapter_GetPrivateData().
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 70b2fd3a32a808c81427be5b36ca8e7e46d4d4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b2fd3a32a808c81427be5b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:51 2015 +0100 dxgi: Implement dxgi_adapter_GetPrivateData(). --- dlls/dxgi/adapter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index b0ed1d8..15a6107 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -99,9 +99,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapt static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter1 *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&adapter->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter1 *iface, REFIID iid, void **parent)

1 0

Henri Verbeet : dxgi: Implement dxgi_factory_SetPrivateData().
by Alexandre Julliard 13 Feb '15

13 Feb '15

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