May 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Avoid moving buffers while they're mapped.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 69bdff62536915a8d5dbbf565e1919e6f3a3f45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bdff62536915a8d5dbbf565… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:04 2012 +0200 wined3d: Avoid moving buffers while they're mapped. --- dlls/wined3d/buffer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index aaa50d7..f11edf4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -476,7 +476,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_in data->buffer_object = buffer->buffer_object; if (!buffer->buffer_object) { - if (buffer->flags & WINED3D_BUFFER_CREATEBO) + if ((buffer->flags & WINED3D_BUFFER_CREATEBO) && !buffer->resource.map_count) { buffer_create_buffer_object(buffer, gl_info); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; @@ -753,6 +753,12 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) TRACE("buffer %p.\n", buffer); + if (buffer->resource.map_count) + { + WARN("Buffer is mapped, skipping preload.\n"); + return; + } + buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); if (!buffer->buffer_object)

1 0

Hans Leidekker : fusion: Enumerate 64-bit assemblies.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: be9459a948097ddaa780745ae2374a320cabd1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9459a948097ddaa780745ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 22 10:10:01 2012 +0200 fusion: Enumerate 64-bit assemblies. --- dlls/fusion/asmenum.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index e4f73e8..1d4de5b 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -21,6 +21,8 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -384,8 +386,10 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) { static const WCHAR gac[] = {'\\','G','A','C',0}; static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; + static const WCHAR gac_64[] = {'\\','G','A','C','_','6','4',0}; static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; WCHAR path[MAX_PATH], buf[MAX_PATH]; + SYSTEM_INFO info; HRESULT hr; DWORD size; @@ -394,6 +398,15 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + GetNativeSystemInfo(&info); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path, buf); + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + } strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); @@ -411,6 +424,14 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path, buf); + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + } strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 54e8bc843461b62fa6c44b91eb028cade72731b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e8bc843461b62fa6c44b91e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue May 22 16:09:19 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9417381..d87a43a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-05-04 07:35+0300\n" +"PO-Revision-Date: 2012-05-22 16:06+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -158,21 +158,10 @@ msgid "Cancel" msgstr "Atsisakyti" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko diegimo programa" +msgstr "Wine Mono diegimo programa" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -181,11 +170,11 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine nepavyko rasti Gecko paketo reikalingo programoms, įterpiančioms HTML, " -"teisingai veikti. Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n" +"Wine nepavyko rasti Mono paketo reikalingo .NET programoms teisingai veikti. " +"Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n" "\n" "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos " -"<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a>." +"<a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a>." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Nikolay Sivov : comctl32: Make it possible to use TVM_GETITEM with item from another tree.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 95a15a3482ba47c1b84fd77a63f95d5cd784a97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a15a3482ba47c1b84fd77a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:31:23 2012 +0400 comctl32: Make it possible to use TVM_GETITEM with item from another tree. --- dlls/comctl32/tests/treeview.c | 13 +++++++- dlls/comctl32/treeview.c | 68 +++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2246c79..a669df9 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -746,8 +746,8 @@ static void test_get_set_item(void) TVITEMA tviRoot = {0}; int nBufferSize = 80; char szBuffer[80] = {0}; + HWND hTree, hTree2; DWORD ret; - HWND hTree; hTree = create_treeview_control(0); fill_tree(hTree); @@ -791,7 +791,18 @@ static void test_get_set_item(void) ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_item_seq, "test get set item", FALSE); + /* get item from a different tree */ + hTree2 = create_treeview_control(0); + + tviRoot.hItem = hRoot; + tviRoot.mask = TVIF_STATE; + tviRoot.state = 0; + ret = SendMessage( hTree2, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); + expect(TRUE, ret); + ok(tviRoot.state == TVIS_FOCUSED, "got state 0x%0x\n", tviRoot.state); + DestroyWindow(hTree); + DestroyWindow(hTree2); } static void test_get_set_itemheight(void) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3f4fdc6..63e3507 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -67,36 +67,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); /* internal structures */ -typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ -{ - HTREEITEM parent; /* handle to parent or 0 if at root */ - HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ - HTREEITEM firstChild; /* handle to first child or 0 if no child */ - - UINT callbackMask; - UINT state; - UINT stateMask; - LPWSTR pszText; - int cchTextMax; - int iImage; - int iSelectedImage; - int iExpandedImage; - int cChildren; - LPARAM lParam; - int iIntegral; /* item height multiplier (1 is normal) */ - int iLevel; /* indentation level:0=root level */ - HTREEITEM lastChild; - HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ - RECT rect; - LONG linesOffset; - LONG stateOffset; - LONG imageOffset; - LONG textOffset; - LONG textWidth; /* horizontal text extent for pszText */ - LONG visibleOrder; /* visible ordering, 0 is first visible item */ -} TREEVIEW_ITEM; - - typedef struct tagTREEVIEW_INFO { HWND hwnd; @@ -163,6 +133,35 @@ typedef struct tagTREEVIEW_INFO WCHAR szSearchParam[ MAX_PATH ]; } TREEVIEW_INFO; +typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ +{ + HTREEITEM parent; /* handle to parent or 0 if at root */ + HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ + HTREEITEM firstChild; /* handle to first child or 0 if no child */ + + UINT callbackMask; + UINT state; + UINT stateMask; + LPWSTR pszText; + int cchTextMax; + int iImage; + int iSelectedImage; + int iExpandedImage; + int cChildren; + LPARAM lParam; + int iIntegral; /* item height multiplier (1 is normal) */ + int iLevel; /* indentation level:0=root level */ + HTREEITEM lastChild; + HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ + RECT rect; + LONG linesOffset; + LONG stateOffset; + LONG imageOffset; + LONG textOffset; + LONG textWidth; /* horizontal text extent for pszText */ + LONG visibleOrder; /* visible ordering, 0 is first visible item */ + const TREEVIEW_INFO *infoPtr; /* tree data this item belongs to */ +} TREEVIEW_ITEM; /******** Defines that TREEVIEW_ProcessLetterKeys uses ****************/ #define KEY_DELAY 450 @@ -1012,6 +1011,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) newItem->iImage = 0; newItem->iSelectedImage = 0; newItem->iExpandedImage = (WORD)I_IMAGENONE; + newItem->infoPtr = infoPtr; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { @@ -2082,7 +2082,13 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) TREEVIEW_ITEM *item = tvItem->hItem; if (!TREEVIEW_ValidItem(infoPtr, item)) - return FALSE; + { + if (!item) return FALSE; + + TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); + infoPtr = item->infoPtr; + if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; + } TREEVIEW_UpdateDispInfo(infoPtr, item, tvItem->mask);

1 0

Michael Stefaniuc : wininet/tests: Remove wrong check for 'len'.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 92c97c1710c8842d4d45f02e5b1527f125f0ca9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c97c1710c8842d4d45f02e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:32:25 2012 +0200 wininet/tests: Remove wrong check for 'len'. --- dlls/wininet/tests/url.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 15fbb09..a391aa6 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -792,7 +792,6 @@ static void InternetCreateUrlA_test(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - ok(len == -1, "Expected len -1, got %d\n", len); /* test valid lpUrlComponents, empty szUrl * lpdwUrlLength is size of buffer required on exit, including

1 0

Michael Stefaniuc : d3dx9_36/tests: Check the correct return value.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 7446af76f4e151d1a701ec2827dfc11b158ce814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7446af76f4e151d1a701ec282… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:36:20 2012 +0200 d3dx9_36/tests: Check the correct return value. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d11a918..aa3ac12 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -480,7 +480,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) res = ID3DXConstantTable_SetMatrix(ctable, device, "mvp", &mvp); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable mvp: got 0x%08x\n", res); - ID3DXConstantTable_SetInt(ctable, device, "i", i + 1); + res = ID3DXConstantTable_SetInt(ctable, device, "i", i + 1); ok(res == D3D_OK, "ID3DXConstantTable_SetInt failed on variable i: got 0x%08x\n", res); /* Check that setting i again will overwrite the previous value */

1 0

Michael Stefaniuc : mshtml/tests: Check the correct variables.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 6034d9dc684c54ad34f59d0e5a16f846cd341de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6034d9dc684c54ad34f59d0e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:37:38 2012 +0200 mshtml/tests: Check the correct variables. --- dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/htmldoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4dc55db..b40fe5d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4414,7 +4414,7 @@ static void test_default_body(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_text(body, &v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); - ok(bstr == NULL, "bstr != NULL\n"); + ok(V_BSTR(&v) == NULL, "bstr != NULL\n"); /* get_text - Invalid Text */ V_VT(&v) = VT_BSTR; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a486f3f..5240f2e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2161,8 +2161,8 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08x\n", hres); if(activeobj) { - IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd); }

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_SetVertices.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: b068615ef38c719cd5f7a309450d1180b40b11c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b068615ef38c719cd5f7a3094… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 08:57:29 2012 +0200 d3drm: Implement IDirect3DRMMesh_SetVertices. --- dlls/d3drm/meshbuilder.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 77b68e4..357e285 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2439,9 +2439,20 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetVertices(IDirect3DRMMesh* iface, { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%u,%u,%p): stub\n", This, id, index, count, values); + TRACE("(%p)->(%u,%u,%u,%p)\n", This, id, index, count, values); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if ((index + count - 1) >= This->groups[id].nb_vertices) + return D3DRMERR_BADVALUE; + + if (!values) + return E_POINTER; + + memcpy(This->groups[id].vertices + index, values, count * sizeof(D3DRMVERTEX)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColor(IDirect3DRMMesh* iface,

1 0

Hans Leidekker : fusion: Get rid of some redundant buffer copying.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 14a0486118d2424b3220ba28e4f84adfafb32749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a0486118d2424b3220ba28e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 22 10:10:22 2012 +0200 fusion: Get rid of some redundant buffer copying. --- dlls/fusion/asmenum.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 1d4de5b..f4da88a 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -398,22 +398,20 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + strcpyW(path, buf); GetNativeSystemInfo(&info); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) @@ -424,27 +422,24 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + strcpyW(path, buf); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr))

1 0

Austin English : uxtheme: plf is already a pointer.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: d7ccfef25b5a128705dbfc11a717c2f4153f02c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ccfef25b5a128705dbfc11a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 21 16:52:40 2012 -0700 uxtheme: plf is already a pointer. --- dlls/uxtheme/metric.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index c056f28..043f836 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -118,7 +118,7 @@ HRESULT WINAPI GetThemeSysFont(HTHEME hTheme, int iFontID, LOGFONTW *plf) } } if(iFontID == TMT_ICONTITLEFONT) { - if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), &plf, 0)) + if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), plf, 0)) return HRESULT_FROM_WIN32(GetLastError()); } else {

1 0