December 2015 - Wine-Commits

Nikolay Sivov : dwrite/tests: Some tests for SetUnderline().
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: ead6905ddb94d9d8a6dadade27f8cfa19d171a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead6905ddb94d9d8a6dadade2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:11 2015 +0300 dwrite/tests: Some tests for SetUnderline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 13ce6f8..f1534bf 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4273,6 +4273,60 @@ static void test_SetOpticalAlignment(void) IDWriteFactory_Release(factory); } +static const struct drawcall_entry drawunderline_seq[] = { + { DRAW_GLYPHRUN, {'a','e',0x0300,0} }, /* reported runs can't mix different underline values */ + { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_UNDERLINE }, + { DRAW_LAST_KIND } +}; + +static void test_SetUnderline(void) +{ + static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ + DWRITE_CLUSTER_METRICS clusters[4]; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + IDWriteFactory *factory; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + + range.startPosition = 0; + range.length = 2; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, drawunderline_seq, "draw underline test", TRUE); + + IDWriteTextLayout_Release(layout); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -4323,6 +4377,7 @@ START_TEST(layout) test_SetTypography(); test_SetLastLineWrapping(); test_SetOpticalAlignment(); + test_SetUnderline(); IDWriteFactory_Release(factory); }

1 0

Thomas Faber : msi: Use the intended attributes when overwriting the target file in cabinet_copy_file.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 689f04849737433e282d19b535e8dcc819061138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689f04849737433e282d19b53… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Nov 23 14:00:54 2015 +0100 msi: Use the intended attributes when overwriting the target file in cabinet_copy_file. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d75f59f..1357a64 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -476,7 +476,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, { TRACE("removing read-only attribute on %s\n", debugstr_w(path)); SetFileAttributesW( path, attrs2 & ~FILE_ATTRIBUTE_READONLY ); - handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs2, NULL); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError();

1 0

Nikolay Sivov : shell32/tests: Basic tests for SHCreateSessionKey().
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 2e4954eb69b8f3baf33d8e61ec4490009aac2a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4954eb69b8f3baf33d8e61e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 27 16:26:18 2015 +0300 shell32/tests: Basic tests for SHCreateSessionKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellole.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 71ba477..e8cf744 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -75,6 +75,7 @@ static HRESULT (WINAPI *pSHPropStgReadMultiple)(IPropertyStorage*, UINT, static HRESULT (WINAPI *pSHPropStgWriteMultiple)(IPropertyStorage*, UINT*, ULONG, const PROPSPEC*, PROPVARIANT*, PROPID); static HRESULT (WINAPI *pSHCreateQueryCancelAutoPlayMoniker)(IMoniker**); +static HRESULT (WINAPI *pSHCreateSessionKey)(REGSAM, HKEY*); static void init(void) { @@ -84,6 +85,7 @@ static void init(void) pSHPropStgReadMultiple = (void*)GetProcAddress(hmod, "SHPropStgReadMultiple"); pSHPropStgWriteMultiple = (void*)GetProcAddress(hmod, "SHPropStgWriteMultiple"); pSHCreateQueryCancelAutoPlayMoniker = (void*)GetProcAddress(hmod, "SHCreateQueryCancelAutoPlayMoniker"); + pSHCreateSessionKey = (void*)GetProcAddress(hmod, (char*)723); } static HRESULT WINAPI PropertyStorage_QueryInterface(IPropertyStorage *This, @@ -858,6 +860,36 @@ static void test_DragQueryFile(void) } #undef DROPTEST_FILENAME +static void test_SHCreateSessionKey(void) +{ + HKEY hkey, hkey2; + HRESULT hr; + + if (!pSHCreateSessionKey) + { + skip("SHCreateSessionKey is not implemented\n"); + return; + } + +if (0) /* crashes on native */ + hr = pSHCreateSessionKey(KEY_READ, NULL); + + hkey = (HKEY)0xdeadbeef; + hr = pSHCreateSessionKey(0, &hkey); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + ok(hkey == NULL, "got %p\n", hkey); + + hr = pSHCreateSessionKey(KEY_READ, &hkey); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pSHCreateSessionKey(KEY_READ, &hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + + RegCloseKey(hkey); + RegCloseKey(hkey2); +} + START_TEST(shellole) { init(); @@ -865,4 +897,5 @@ START_TEST(shellole) test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); test_DragQueryFile(); + test_SHCreateSessionKey(); }

1 0

Nikolay Sivov : dwrite: Implement EUDC font collection.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 57bfebfc806d8e700e23898cff30bbaadeaeca52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57bfebfc806d8e700e23898cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:12 2015 +0300 dwrite: Implement EUDC font collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 198 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 148 insertions(+), 50 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9244978..89d50b3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3234,6 +3234,27 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator * return ref; } +static HRESULT create_local_file_reference(IDWriteFactory2 *factory, const WCHAR *filename, IDWriteFontFile **file) +{ + HRESULT hr; + + /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ + if (!strchrW(filename, '\\')) { + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + WCHAR fullpathW[MAX_PATH]; + + GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + strcatW(fullpathW, fontsW); + strcatW(fullpathW, filename); + + hr = IDWriteFactory2_CreateFontFileReference(factory, fullpathW, NULL, file); + } + else + hr = IDWriteFactory2_CreateFontFileReference(factory, filename, NULL, file); + + return hr; +} + static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); @@ -3266,19 +3287,7 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil return E_FAIL; } - /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ - if (!strchrW(filename, '\\')) { - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; - WCHAR fullpathW[MAX_PATH]; - - GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); - strcatW(fullpathW, fontsW); - strcatW(fullpathW, filename); - - hr = IDWriteFactory2_CreateFontFileReference(enumerator->factory, fullpathW, NULL, file); - } - else - hr = IDWriteFactory2_CreateFontFileReference(enumerator->factory, filename, NULL, file); + hr = create_local_file_reference(enumerator->factory, filename, file); heap_free(value); heap_free(filename); @@ -3379,56 +3388,145 @@ HRESULT get_system_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollectio return hr; } -static HRESULT WINAPI eudcfontfileenumerator_QueryInterface(IDWriteFontFileEnumerator *iface, REFIID riid, void **obj) +static HRESULT eudc_collection_add_family(IDWriteFactory2 *factory, struct dwrite_fontcollection *collection, + const WCHAR *keynameW, const WCHAR *pathW) { - *obj = NULL; + static const WCHAR defaultfontW[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t','E','U','D','C','F','o','n','t',0}; + static const WCHAR emptyW[] = {0}; + IDWriteLocalizedStrings *names; + DWRITE_FONT_FACE_TYPE face_type; + DWRITE_FONT_FILE_TYPE file_type; + BOOL supported; + UINT32 face_count, i; + IDWriteFontFile *file; + HRESULT hr; + struct dwrite_fontfamily_data *family_data; - if (IsEqualIID(riid, &IID_IDWriteFontFileEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { - IDWriteFontFileEnumerator_AddRef(iface); - *obj = iface; - return S_OK; + /* create font file from this path */ + hr = create_local_file_reference(factory, pathW, &file); + if (FAILED(hr)) + return S_FALSE; + + /* failed font files are skipped */ + hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); + if (FAILED(hr) || !supported || face_count == 0) { + TRACE("unsupported font (%p, 0x%08x, %d, %u)\n", file, hr, supported, face_count); + IDWriteFontFile_Release(file); + return S_FALSE; } - return E_NOINTERFACE; -} + /* create and init new family */ -static ULONG WINAPI eudcfontfileenumerator_AddRef(IDWriteFontFileEnumerator *iface) -{ - return 2; -} + /* Family names are added for non-specific locale, represented with empty string. + Default family appears with empty family name. */ + create_localizedstrings(&names); + if (!strcmpiW(keynameW, defaultfontW)) + add_localizedstring(names, emptyW, emptyW); + else + add_localizedstring(names, emptyW, keynameW); -static ULONG WINAPI eudcfontfileenumerator_Release(IDWriteFontFileEnumerator *iface) -{ - return 1; -} + hr = init_fontfamily_data(names, &family_data); + IDWriteLocalizedStrings_Release(names); + if (hr != S_OK) { + IDWriteFontFile_Release(file); + return hr; + } -static HRESULT WINAPI eudcfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) -{ - *file = NULL; - return E_FAIL; -} + /* fill with faces */ + for (i = 0; i < face_count; i++) { + struct dwrite_font_data *font_data; -static HRESULT WINAPI eudcfontfileenumerator_MoveNext(IDWriteFontFileEnumerator *iface, BOOL *current) -{ - *current = FALSE; - return S_OK; + /* alloc and init new font data structure */ + hr = init_font_data(factory, file, face_type, i, &names, &font_data); + if (FAILED(hr)) + continue; + + IDWriteLocalizedStrings_Release(names); + + /* add font to family */ + hr = fontfamily_add_font(family_data, font_data); + if (hr != S_OK) + release_font_data(font_data); + } + + /* add family to collection */ + hr = fontcollection_add_family(collection, family_data); + if (FAILED(hr)) + release_fontfamily_data(family_data); + IDWriteFontFile_Release(file); + + return hr; } -static const struct IDWriteFontFileEnumeratorVtbl eudcfontfileenumeratorvtbl = +HRESULT get_eudc_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollection **ret) { - eudcfontfileenumerator_QueryInterface, - eudcfontfileenumerator_AddRef, - eudcfontfileenumerator_Release, - eudcfontfileenumerator_MoveNext, - eudcfontfileenumerator_GetCurrentFontFile -}; + static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; + struct dwrite_fontcollection *collection; + static const WCHAR emptyW[] = {0}; + WCHAR eudckeypathW[16]; + HKEY eudckey; + DWORD index; + BOOL exists; + LONG retval; + HRESULT hr; + UINT32 i; -static IDWriteFontFileEnumerator eudc_fontfile_enumerator = { &eudcfontfileenumeratorvtbl }; + TRACE("building EUDC font collection for factory %p, ACP %u\n", factory, GetACP()); -HRESULT get_eudc_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollection **collection) -{ - TRACE("building EUDC font collection for factory %p\n", factory); - return create_font_collection(factory, &eudc_fontfile_enumerator, FALSE, collection); + *ret = NULL; + + collection = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!collection) return E_OUTOFMEMORY; + + hr = init_font_collection(collection, FALSE); + if (FAILED(hr)) { + heap_free(collection); + return hr; + } + + *ret = &collection->IDWriteFontCollection_iface; + + /* return empty collection if EUDC fonts are not configured */ + sprintfW(eudckeypathW, eudckeyfmtW, GetACP()); + if (RegOpenKeyExW(HKEY_CURRENT_USER, eudckeypathW, 0, GENERIC_READ, &eudckey)) + return S_OK; + + retval = ERROR_SUCCESS; + index = 0; + while (retval != ERROR_NO_MORE_ITEMS) { + WCHAR keynameW[64], pathW[MAX_PATH]; + DWORD type, path_len, name_len; + + path_len = sizeof(pathW)/sizeof(*pathW); + name_len = sizeof(keynameW)/sizeof(*keynameW); + retval = RegEnumValueW(eudckey, index++, keynameW, &name_len, NULL, &type, (BYTE*)pathW, &path_len); + if (retval || type != REG_SZ) + continue; + + hr = eudc_collection_add_family(factory, collection, keynameW, pathW); + if (hr != S_OK) + WARN("failed to add family %s, path %s\n", debugstr_w(keynameW), debugstr_w(pathW)); + } + RegCloseKey(eudckey); + + /* try to add global default if not defined for specific codepage */ + exists = FALSE; + hr = IDWriteFontCollection_FindFamilyName(&collection->IDWriteFontCollection_iface, emptyW, + &index, &exists); + if (FAILED(hr) || !exists) { + const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; + hr = eudc_collection_add_family(factory, collection, emptyW, globaldefaultW); + if (hr != S_OK) + WARN("failed to add global default EUDC font, 0x%08x\n", hr); + } + + /* EUDC collection offers simulated faces too */ + for (i = 0; i < collection->family_count; i++) { + fontfamily_add_bold_simulated_face(collection->family_data[i]); + fontfamily_add_oblique_simulated_face(collection->family_data[i]); + } + + return S_OK; } static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : dwrite/tests: Fix test failures on older versions.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 8165cba0f8c774c29ef794ac49e667250d122505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8165cba0f8c774c29ef794ac4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:10 2015 +0300 dwrite/tests: Fix test failures on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 637a8ea..13ce6f8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2058,7 +2058,8 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); - ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + ok((range.startPosition == 0 && range.length == ~0u) || + broken(range.startPosition == 0 && range.length == 4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); /* check what's returned for positions after the text */ buffW[0] = 0; @@ -2067,7 +2068,8 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); - ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + ok((range.startPosition == 0 && range.length == ~0u) || + broken(range.startPosition == 4 && range.length == ~0u-4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Thomas Faber : quartz: Don' t cache IFilterMapper2 interface in FilterGraph2.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 3b48ba6c1da9f2b88f5413efcb09e954ee331131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b48ba6c1da9f2b88f5413efc… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 15:07:52 2015 +0100 quartz: Don't cache IFilterMapper2 interface in FilterGraph2. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 43 ++++++++++++++++++++++++++--------------- dlls/quartz/tests/filtergraph.c | 2 -- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 495f4be..9f072a8 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -176,7 +176,6 @@ typedef struct _IFilterGraphImpl { IUnknown *outer_unk; LONG ref; IUnknown *punkFilterMapper2; - IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; ULONG nFilters; @@ -265,11 +264,11 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper2, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper2 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphConfig_iface; TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); @@ -319,9 +318,6 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) IUnknown_Release(This->ItfCacheEntries[i].iface); } - /* AddRef on controlling IUnknown, to compensate for Release of cached IFilterMapper2 */ - IUnknown_AddRef(This->outer_unk); - IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); if (This->pSite) IUnknown_Release(This->pSite); @@ -910,6 +906,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, CLSID FilterCLSID; PIN_DIRECTION dir; unsigned int i = 0; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); @@ -999,10 +996,16 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, TRACE("MajorType %s\n", debugstr_guid(&mt->majortype)); TRACE("SubType %s\n", debugstr_guid(&mt->subtype)); + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) { + WARN("Unable to get IFilterMapper2 (%x)\n", hr); + goto out; + } + /* Try to find a suitable filter that can connect to the pin to render */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); goto out; @@ -1172,6 +1175,8 @@ error: IEnumMoniker_Release(pEnumMoniker); out: + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); if (penummt) IEnumMediaTypes_Release(penummt); if (mt) @@ -1267,6 +1272,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) ULONG nb; IMoniker* pMoniker; INT x; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); @@ -1376,10 +1382,20 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) continue; } + if (pFilterMapper2 == NULL) + { + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) + { + WARN("Unable to query IFilterMapper2 (%x)\n", hr); + break; + } + } + /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); @@ -1493,6 +1509,9 @@ error: hr = S_OK; } + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); + IEnumMediaTypes_Release(penummt); return hr; } @@ -5708,14 +5727,6 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); - if (SUCCEEDED(hr)) - hr = IUnknown_QueryInterface(fimpl->punkFilterMapper2, &IID_IFilterMapper2, - (void**)&fimpl->pFilterMapper2); - - if (SUCCEEDED(hr)) - /* Release controlling IUnknown - compensate refcount increase from caching IFilterMapper2 interface. */ - IUnknown_Release(fimpl->outer_unk); - if (FAILED(hr)) { ERR("Unable to create filter mapper (%x)\n", hr); if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f3af03e..39d6e88 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1942,9 +1942,7 @@ static void test_aggregate_filter_graph(void) ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); -todo_wine ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); -todo_wine ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); unk_outer.AddRef_called = 0; unk_outer.Release_called = 0;

1 0

Sebastian Lackner : oleaut32: Align terminating null character in SysAllocStringByteLen.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: e559ec2ad3ca41b7e169ab157e0d73c39b4c75b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e559ec2ad3ca41b7e169ab157… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 25 06:38:10 2015 +0100 oleaut32: Align terminating null character in SysAllocStringByteLen. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 14 ++++++-------- dlls/oleaut32/tests/vartype.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 75f9cb4..78cb083 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -149,12 +149,9 @@ static bstr_t *alloc_bstr(size_t size) if(cache_entry) { if(WARN_ON(heap)) { - size_t tail; - - memset(ret, ARENA_INUSE_FILLER, FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)])); - tail = bstr_alloc_size(size) - FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)]); - if(tail) - memset(ret->u.ptr+size+sizeof(WCHAR), ARENA_TAIL_FILLER, tail); + size_t fill_size = (FIELD_OFFSET(bstr_t, u.ptr[size])+2*sizeof(WCHAR)-1) & ~(sizeof(WCHAR)-1); + memset(ret, ARENA_INUSE_FILLER, fill_size); + memset((char *)ret+fill_size, ARENA_TAIL_FILLER, bstr_alloc_size(size)-fill_size); } ret->size = size; return ret; @@ -418,10 +415,11 @@ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) if(str) { memcpy(bstr->u.ptr, str, len); - bstr->u.ptr[len] = bstr->u.ptr[len+1] = 0; + bstr->u.ptr[len] = 0; }else { - memset(bstr->u.ptr, 0, len+sizeof(WCHAR)); + memset(bstr->u.ptr, 0, len+1); } + bstr->u.str[(len+sizeof(WCHAR)-1)/sizeof(WCHAR)] = 0; return bstr->u.str; } diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7cbb059..d905d37 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5444,7 +5444,9 @@ static void test_SysAllocStringByteLen(void) { const OLECHAR szTest[10] = { 'T','e','s','t','\0' }; const CHAR szTestA[6] = { 'T','e','s','t','\0','?' }; + char *buf; BSTR str; + int i; if (sizeof(void *) == 4) /* not limited to 0x80000000 on Win64 */ { @@ -5487,6 +5489,7 @@ static void test_SysAllocStringByteLen(void) ok (bstr->dwLen == 3, "Expected 3, got %d\n", bstr->dwLen); ok (!lstrcmpA((LPCSTR)bstr->szString, szTestTruncA), "String different\n"); + ok (!bstr->szString[2], "String not terminated\n"); SysFreeString(str); } @@ -5500,6 +5503,32 @@ static void test_SysAllocStringByteLen(void) ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); SysFreeString(str); } + + /* Make sure terminating null is aligned properly */ + buf = HeapAlloc(GetProcessHeap(), 0, 1025); + ok (buf != NULL, "Expected non-NULL\n"); + for (i = 0; i < 1024; i++) + { + LPINTERNAL_BSTR bstr; + + str = SysAllocStringByteLen(NULL, i); + ok (str != NULL, "Expected non-NULL\n"); + bstr = Get(str); + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); + SysFreeString(str); + + memset(buf, 0xaa, 1025); + str = SysAllocStringByteLen(buf, i); + ok (str != NULL, "Expected non-NULL\n"); + bstr = Get(str); + ok (bstr->dwLen == i, "Expected %d, got %d\n", i, bstr->dwLen); + buf[i] = 0; + ok (!lstrcmpA((LPCSTR)bstr->szString, buf), "String different\n"); + ok (!bstr->szString[(i+sizeof(WCHAR)-1)/sizeof(WCHAR)], "String not terminated\n"); + SysFreeString(str); + } + HeapFree(GetProcessHeap(), 0, buf); } static void test_SysReAllocString(void)

1 0

Sebastian Lackner : server: Implement wineserver call for SystemHandleInformation.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 08706ef357e7feb8d12f89e1b9c44fdc31cd4da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08706ef357e7feb8d12f89e1b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 24 13:08:50 2015 +0100 server: Implement wineserver call for SystemHandleInformation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 49 ++++++++++++++++++++++++++++++------ dlls/ntdll/tests/info.c | 10 ++++---- include/wine/server_protocol.h | 28 ++++++++++++++++++++- server/handle.c | 56 ++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 16 ++++++++++++ server/request.h | 5 ++++ server/trace.c | 30 ++++++++++++++++++++++ 7 files changed, 180 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08706ef357e7feb8d12f8…

1 0

Andrey Gusev : wine.inf: Fix LanguagePack entry.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 0bb7b65a32b391dd196db01b1c8e10339f9e4909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb7b65a32b391dd196db01b1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Dec 26 13:31:18 2015 +0200 wine.inf: Fix LanguagePack entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fb2583d..7178140 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -491,7 +491,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 -HKLM,%CurrentVersionNT%\Language Pack,,16 +HKLM,%CurrentVersionNT%\LanguagePack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16 HKLM,%CurrentVersionNT%\OpenGLDrivers,,16 HKLM,%CurrentVersionNT%\Perflib,,16 @@ -3334,7 +3334,7 @@ HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Fonts,"SymbolicLin HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\FontSubstitutes,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Gre_Initialize,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Gre_Initialize" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Image File Execution Options,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options" -HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Language Pack,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Language Pack" +HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\LanguagePack,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\LanguagePack" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\NetworkCards,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\NetworkCards" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Perflib,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Perflib" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Ports,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Ports"

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 64935d61d9d0d5f789f26260d52ccf96f1a24840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64935d61d9d0d5f789f26260d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Dec 27 01:40:48 2015 +0100 loader: Update French translation of wine manpage. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.fr.UTF-8.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.fr.UTF-8.man.in b/loader/wine.fr.UTF-8.man.in index 2d4c543..c2a2ae6 100644 --- a/loader/wine.fr.UTF-8.man.in +++ b/loader/wine.fr.UTF-8.man.in @@ -24,11 +24,11 @@ Pour déboguer wine, utilisez plutôt Pour exécuter des applications en ligne de commande (programmes Windows console), préférez .BR wineconsole . -Cela permet d'afficher la sortie dans une fenêtre séparée (nécessite X11). +Cela permet d'afficher la sortie dans une fenêtre séparée. Si vous n'utilisez pas .B wineconsole pour les programmes en ligne de commande, le support console sera très limité et votre -programme peut ne pas fonctionner correctement. +programme pourrait ne pas fonctionner correctement. .PP Lorsque wine est invoqué avec .B --help

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: c7a0af4830c0aedfe9c0130ca4126dfe0a5cb984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a0af4830c0aedfe9c0130ca… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 15:08:13 2015 +0100 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index 251a140..56d34c2 100644 --- a/po/fr.po +++ b/po/fr.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: 2015-10-03 11:45+0100\n" +"PO-Revision-Date: 2015-12-26 15:07+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -8632,58 +8632,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Cacher" +msgstr "Cacher %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Autre" +msgstr "Cacher les autres" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Afficher" +msgstr "Tout afficher" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Quitter %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Quitter" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Fenêtre" +msgstr "Fenêtre" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Réduire" +msgstr "Réduire" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Zoom avant" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Plein écran" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Toujours &visible" +msgstr "Tout amener à l'avant-plan" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -13117,7 +13103,7 @@ msgstr "" "\n" "Options :\n" " --help\t Afficher ces informations.\n" -" --list\t Lister toutes les applications installées dans ce préfix " +" --list\t Lister toutes les applications installées dans ce préfixe " "Wine.\n" " --remove {GUID} Désinstaller l'application spécifiée.\n" "\t\t Utilisez « --list » pour déterminer le GUID de l'application.\n"

1 0

Austin English : include/bugs.php: don't exclude RESOLVED FIXED bugs
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: appdb Branch: master Commit: 822908762fa0e5950f626ed27df520f6d5dc50e3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=822908762fa0e5950f626ed2… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 01:31:57 2015 -0600 include/bugs.php: don't exclude RESOLVED FIXED bugs This code was written before RESOLVED FIXED bugs started being closed on a regular basis. Given that the bugs are now closed with every release, bugs that aren't yet fixed in the latest release should be visible to users looking at applications. Originally reported by Rosanne Dimesio here: https://www.winehq.org/pipermail/wine-devel/2015-September/109432.html Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index d933b7c..63853d7 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -370,7 +370,7 @@ class Bug function isOpen() { - return ($this->sBug_status != 'RESOLVED' && $this->sBug_status != 'CLOSED'); + return ($this->sBug_status != 'CLOSED'); } function allowAnonymousSubmissions()

1 0

Frédéric Delanoy : French translation for release 1.8-rc2 (try 2)
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 0fb28da76fbbdf6027b0f3fbcf9236f49d21530a URL: http://source.winehq.org/git/website.git/?a=commit;h=0fb28da76fbbdf6027b0f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:51:53 2015 +0100 French translation for release 1.8-rc2 (try 2) Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015112701.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2015112701.xml b/news/fr/2015112701.xml new file mode 100644 index 0000000..595d529 --- /dev/null +++ b/news/fr/2015112701.xml @@ -0,0 +1,11 @@ +<news> +<date>27 novembre 2015</date> +<title>Sortie de Wine 1.8-rc2</title> +<body> +La version de développement 1.8-rc2 de Wine est disponible. +<a href="{$root}/announce/1.8-rc2">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc2.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : Update French downloads page
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 958d762fee123eaa664d308e7dc7fd74f5880c56 URL: http://source.winehq.org/git/website.git/?a=commit;h=958d762fee123eaa664d30… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Dec 27 22:03:58 2015 +0100 Update French downloads page Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/fr/download.template | 74 +++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/templates/fr/download.template b/templates/fr/download.template index 0391209..59cb7b1 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -56,60 +56,68 @@ center;">Voyez la <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> - <td align="center" bgcolor="black">Système</td> - <td align="center" bgcolor="black">Notes</td> + <td align="center" bgcolor="black"></td> + <td align="center" bgcolor="black">Paquets binaires WineHQ</td> <td align="center" bgcolor="black">Maintenanceur</td> </tr> - + <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> + <td align="center"></td> + <td align="center">Ces paquets sont construits et supportés par WineHQ. + Veuillez rapporter tout problème rencontré (en anglais) dans le <a href="http://bugs.winehq.org">bugzilla de WineHQ</a>. </td> - <td> <a href="{$root}/download/ubuntu">Paquets Ubuntu</a> - - .deb binaires et sources pour Ubuntu - <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> + <td></td> </tr> - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> + <tr bgcolor="#ffffff"> + <td align="center"> + <img src="{$root}/images/winehq_logo_glass_sm.png" alt="WineHQ" border="0"></a> </td> - <td> <a href="{$root}/download/debian">Paquets Debian</a> - - .deb binaires pour Debian</td> - <td><a href="mailto:pkg-wine-party(a)lists.alioth.debian.org">Debian Wine Party</a></td> + <td> + <a href="http://wiki.winehq.org/Ubuntu">Ubuntu</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Ubuntu 12.04, 14.04, 15.04, 15.10, 16.04 + <a href="http://wiki.winehq.org/Debian">Debian</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Debian Wheezy, Jessie, Stretchi et Sid + <a href="http://wiki.winehq.org/Fedora">Fedora</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Fedora 22 and 23 + <a href="http://wiki.winehq.org/Mageia">Mageia</a> + - paquets binaires WineHQ pour les branches de développement et staging pour Mageia 4 and 5 + Mac OS X + - prévu ; pas encore disponible pour le téléchargement. + <td><a href="mailto: michael(a)fds-team.de">Michael Müller</a></td> + </tr> + + <tr> + <td align="center" bgcolor="black"></td> + <td align="center" bgcolor="black">Paquets binaires des distributions</td> + <td align="center" bgcolor="black">Maintenanceur</td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> + <td align="center"></td> + <td align="center">Ces paquets sont construits et supportés par les distributions. + Veuillez rapporter tout problème rencontré au maintenanceur du paquet. </td> - <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Paquets Red Hat / CentOS / Fedora</a> - - .rpm binaires et sources pour Red Hat Enterprise Linux 5 et 6, CentOS - 5 et 6, Fedora Linux 16, 17 et distributions compatibles. - Le méta-paquet wine est disponible via <tt>yum</tt> au travers du - dépôt EPEL / Fedora Extras / Fedora en exécutant - <tt>$ yum install wine </tt>" - </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td></td> </tr> - + <tr bgcolor="#ffffff"> <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> - <td> <a href="http://en.opensuse.org/Wine#Repositories">Paquets SUSE</a> - - .rpm binaires et sources et instantanés quotidiens pour openSUSE - 11.4 - 13.2 ainsi que SUSE Linux Enterprise 11. + <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> + - .rpm binaires et sources, et instantanés quotidiens pour toutes les versions de openSUSE + (11.4 jusqu'à 13.2) et SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> - + <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Paquets Slackware</a> - - .txz binaires (Slackware 14.0) ou .tgz (pour les versions antérieures)</td> + <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware</a> + - .txz binaires (Slackware 14.1), et .tgz binaires (pour les versions plus anciennes)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> @@ -117,7 +125,7 @@ center;">Voyez la <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.freshports.org/emulators/wine/">Paquets FreeBSD</a> + <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> - code source pour FreeBSD 5.3 ou ultérieur</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr> @@ -129,7 +137,7 @@ center;">Voyez la Parfois, il arrive qu'une adaptation de Wine permette à une application de fonctionner correctement, mais qu'elle ne puisse être incorporée à Wine pour une -raison quelconque. Pour pallier aux imperfections actuelles de Wine, diverses +raison quelconque. Pour pallier les imperfections actuelles de Wine, diverses applications tierces pour utilisateurs finaux ont été conçues au fil des ans. Les développeurs Wine ne supportent en aucun cas ces applications, mais il se peut que vous les trouviez utiles. Pour plus d'informations, voyez notre page

1 0

Frédéric Delanoy : French translation for release 1.8-rc1
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: bbc9a87b769da5dacbe59a4f5284ee49f100138f URL: http://source.winehq.org/git/website.git/?a=commit;h=bbc9a87b769da5dacbe59a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:31:48 2015 +0100 French translation for release 1.8-rc1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015112001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/fr/2015112001.xml b/news/fr/2015112001.xml new file mode 100644 index 0000000..d332b79 --- /dev/null +++ b/news/fr/2015112001.xml @@ -0,0 +1,13 @@ +<news> +<date>20 novembre 2015</date> +<title>Sortie de Wine 1.8-rc1</title> +<body> +La version de développement 1.8-rc1 de Wine est disponible. + C'est la première version candidate du prochain Wine 1.8. Merci de tester adéquatement cette +version afin que la version 1.8 soit la meilleure possible. +<a href="{$root}/announce/1.8-rc1">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8-rc4
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: c2c9d8b8bfbad3b4e39942cc17a01e3d38a58bec URL: http://source.winehq.org/git/website.git/?a=commit;h=c2c9d8b8bfbad3b4e39942… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:51:55 2015 +0100 French translation for release 1.8-rc4 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015121201.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2015121201.xml b/news/fr/2015121201.xml new file mode 100644 index 0000000..72cae71 --- /dev/null +++ b/news/fr/2015121201.xml @@ -0,0 +1,11 @@ +<news> +<date>12 décembre 2015</date> +<title>Sortie de Wine 1.8-rc4</title> +<body> +La version de développement 1.8-rc4 de Wine est disponible. +<a href="{$root}/announce/1.8-rc4">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc4.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8-rc3
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: a20805be565576925d72aa4914dc31323eab487c URL: http://source.winehq.org/git/website.git/?a=commit;h=a20805be565576925d72aa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 12:51:54 2015 +0100 French translation for release 1.8-rc3 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015120401.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2015120401.xml b/news/fr/2015120401.xml new file mode 100644 index 0000000..78f0efb --- /dev/null +++ b/news/fr/2015120401.xml @@ -0,0 +1,11 @@ +<news> +<date>4 décembre 2015</date> +<title>Sortie de Wine 1.8-rc3</title> +<body> +La version de développement 1.8-rc3 de Wine est disponible. +<a href="{$root}/announce/1.8-rc3">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bugs uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 388fbe930bbde920f3b67b48b6d02335da485470 URL: http://source.winehq.org/git/website.git/?a=commit;h=388fbe930bbde920f3b67b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 13:18:42 2015 +0100 French translation for release 1.8 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015121901.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/fr/2015121901.xml b/news/fr/2015121901.xml new file mode 100644 index 0000000..fa9132c --- /dev/null +++ b/news/fr/2015121901.xml @@ -0,0 +1,13 @@ +<news> +<date>19 décembre 2015</date> +<title>Sortie de Wine 1.8</title> +<body> + L'équipe de Wine est fière d'annoncer la disponibilité de la version stable 1.8 de Wine. + Cette version représente 17 mois d'efforts de développement et environ 13 000 changements +individuels. Les points forts principaux sont l'implémentation de DirectWrite et Direct2D, et le +nouveau pilote Pulse Audio. + Elle comprend également quantité d'améliorations dans tous les domaines, ainsi que la prise en +charge de nombreuses nouvelles applications et jeux. Voyez les <a href="{$root}/announce/1.8">notes +de version</a> pour un résumé des changements principaux. +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.9.0
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 34fb2e43ac3721edf561abe0a18ac4066d24bed0 URL: http://source.winehq.org/git/website.git/?a=commit;h=34fb2e43ac3721edf561ab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 26 14:18:36 2015 +0100 French translation for release 1.9.0 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015122501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015122501.xml b/news/fr/2015122501.xml new file mode 100644 index 0000000..1579a12 --- /dev/null +++ b/news/fr/2015122501.xml @@ -0,0 +1,15 @@ +<news> +<date>25 décembre 2015</date> +<title>Sortie de Wine 1.9.0</title> +<body> +La version de développement 1.9.0 de Wine est disponible. +<a href="{$root}/announce/1.9.0">Nouveautés</a> de cette version : +<ul> + <li>Certains correctifs différés par la période de gel du code.</li> + <li>Implémentation de WSAPoll.</li> + <li>Correctifs dans la boîte de dialogue standard de sélection de polices.</li> + <li>Améliorations dans le glisser-déposer X11.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.0.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Rosanne DiMesio : Redirect Ubuntu and Debian downloads pages
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: 25fbae3b5c1fa10b88bb9113dd5f463175d13db7 URL: http://source.winehq.org/git/website.git/?a=commit;h=25fbae3b5c1fa10b88bb91… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Dec 22 15:05:58 2015 -0600 Redirect Ubuntu and Debian downloads pages Redirects /downloads/ubuntu and /downloads/debian to their respective wiki pages. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 5efb8bf..4d04076 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -40,7 +40,9 @@ RedirectPermanent /download.shtml https://www.winehq.org/download RedirectPermanent /download.html https://www.winehq.org/download RedirectPermanent /download-mirrors.html https://www.winehq.org/download RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download -RedirectPermanent /site/download-deb https://www.winehq.org/download/debian +RedirectPermanent /site/download-deb http://wiki.winehq.org/Debian +RedirectPermanent /download/debian http://wiki.winehq.org/Debian +RedirectPermanent /download/ubuntu http://wiki.winehq.org/Ubuntu RedirectPermanent /site/getting_help https://www.winehq.org/help RedirectPermanent /support.shtml https://www.winehq.org/help RedirectPermanent /News/status.html https://www.winehq.org/status

1 0

Rosanne DiMesio : Delete Ubuntu and Debian Downloads pages
by Jeremy Newman Dec. 28, 2015

Dec. 28, 2015

Module: website Branch: master Commit: f8824624c49c1dbd3e089b03b2bb62ea531e2c2a URL: http://source.winehq.org/git/website.git/?a=commit;h=f8824624c49c1dbd3e089b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Dec 22 12:27:34 2015 -0600 Delete Ubuntu and Debian Downloads pages Instructions are now on the wiki. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/download/ubuntu.template | 66 ------------- templates/en/download/debian.template | 162 ------------------------------- templates/en/download/ubuntu.template | 63 ------------ templates/es/download/deb.template | 112 --------------------- templates/fr/download/ubuntu.template | 67 ------------- templates/pl/download/ubuntu.template | 63 ------------ templates/pt/download/ubuntu.template | 61 ------------ templates/tr/download/ubuntu.template | 50 ---------- templates/uk/download/ubuntu.template | 57 ----------- templates/zh-cn/download/ubuntu.template | 51 ---------- 10 files changed, 752 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=f8824624c49c1dbd3e…

1 0

Alexandre Julliard : Release 1.8.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: master Commit: fd9b5244c45cf5dda83060ea6a7b3eca9e0a5366 URL: http://source.winehq.org/git/docs.git/?a=commit;h=fd9b5244c45cf5dda83060ea6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 20:04:21 2015 +0100 Release 1.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 104 ++++++++++++++++++++++++++++++++++++++++++++++---------------- VERSION | 2 +- configure | 32 +++++++++++++------ 3 files changed, 100 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=fd9b5244c45cf5dda8306…

1 0

André Hentschel : winelib: Remove some outdated information about the C libraries.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: master Commit: cb5403292188f6cf2a2ed748c3370a1fa34fff95 URL: http://source.winehq.org/git/docs.git/?a=commit;h=cb5403292188f6cf2a2ed748c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:07:31 2015 +0100 winelib: Remove some outdated information about the C libraries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- en/winelib-porting.sgml | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/en/winelib-porting.sgml b/en/winelib-porting.sgml index d7a6124..bd7731d 100644 --- a/en/winelib-porting.sgml +++ b/en/winelib-porting.sgml @@ -76,43 +76,7 @@ <para> Add <option>-mno-cygwin</option> to your compiler flags. This will cause <command>winebuild</command> to resolve your C - library calls to <filename class="libraryfile">msvcrt.dll</filename>. Many simple - calls which behave the same have been specified as - non-importable from msvcrt; in these cases - <command>winebuild</command> will not resolve them and the - standard linker <command>ld</command> will link to the glibc - version instead. - </para> - <para> - In order to avoid warnings in C (and potential errors in C++) - from not having prototypes, you may need to use a set of MS - compatible header files. These are scheduled for inclusion - into Wine but at the time of writing are not available. Until - they are, you can try prototyping the functions you need, or - just live with the warnings. - </para> - <para> - If you have a set of include files (or when they are available - in Wine), you need to use the <parameter>-isystem - <replaceable>include_path</replaceable></parameter> flag to gcc to tell it to use your - headers in preference to the local system headers. - </para> - <para> - To use option 3, add the names of any symbols that you don't - want to use from msvcrt into your applications - <filename class="extension">.spec</filename> file. For example, if you wanted - the MS specific functions, but not file I/O, you could have a - list like: - </para> - - <programlisting>@ignore = ( fopen fclose fwrite fread fputs fgets )</programlisting> - <para> - Obviously, the complete list would be much longer. Remember - too that some functions are implemented with an underscore in - their name and <function>#define</function>d to that name in - the MS headers. So you may need to find out the name by - examining <filename>dlls/msvcrt/msvcrt.spec</filename> to get - the correct name for your <function>@ignore</function> entry. + library calls to <filename class="libraryfile">msvcrt.dll</filename>. </para> </sect1>

1 0

André Hentschel : wineusr: Update supported versions.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: master Commit: a2105653d6d0e322d7111b885ce924209fa2e75a URL: http://source.winehq.org/git/docs.git/?a=commit;h=a2105653d6d0e322d7111b885… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:07:23 2015 +0100 wineusr: Update supported versions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- en/wineusr-introduction.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml index b487e6d..16f62b1 100644 --- a/en/wineusr-introduction.sgml +++ b/en/wineusr-introduction.sgml @@ -178,7 +178,7 @@ <listitem> <para> Support for running Win64, - Win32 (Win 95/98, NT/2000/XP/2003/Vista/2008/7), + Win32 (Win 95/98, NT/2000/XP/2003/Vista/2008/7/2012/10), Win16 (Win 3.1) and DOS programs </para> </listitem>

1 0

Tag wine-docs-1.8 : Alexandre Julliard : Release 1.8
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: docs Branch: refs/tags/wine-docs-1.8 Tag: 08596751e6e8e73cd88f3faabbc89e438dbe04c8 URL: http://source.winehq.org/git/docs.git/?a=tag;h=08596751e6e8e73cd88f3faabbc8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 20:04:21 2015 +0100 Release 1.8

1 0