September 2015 - Wine-Commits

Jactry Zeng : riched20: Repaint paragraph after undo format setting of the paragraph.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: 515b4a972561827cd954ee7ca34aaeb5a3621a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b4a972561827cd954ee7ca… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 4 15:54:18 2015 +0800 riched20: Repaint paragraph after undo format setting of the paragraph. --- dlls/riched20/undo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 9db690e..7b22e6d 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -341,6 +341,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) add_undo_set_para_fmt( editor, &para->member.para ); *para->member.para.pFmt = undo->u.set_para_fmt.fmt; para->member.para.border = undo->u.set_para_fmt.border; + para->member.para.nFlags |= MEPF_REWRAP; break; } case undo_set_char_fmt:

1 0

Nikolay Sivov : dwrite/tests: Fix some test failures on Win10.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: 8747fa2b9f6ca9546aec5817d95974100101ae55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8747fa2b9f6ca9546aec5817d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 4 12:16:08 2015 +0300 dwrite/tests: Fix some test failures on Win10. --- dlls/dwrite/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2a625d5..dfe782d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1327,7 +1327,14 @@ todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_UNKNOWN, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +todo_wine + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* < win10 */, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(fontface != NULL, "got %p\n", fontface); + face_type = IDWriteFontFace_GetType(fontface); + ok(face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE, "got %d\n", face_type); + IDWriteFontFace_Release(fontface); + } IDWriteFontFile_Release(file); IDWriteFactory_Release(factory); @@ -1953,8 +1960,10 @@ static void test_CreateCustomFontFileReference(void) factory = create_factory(); factory2 = create_factory(); +if (0) { /* crashes on win10 */ hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2);

1 0

Stefan Dösinger : wined3d: Return a texture from the swapchain resource creation callback.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: fa0041954f600ff92cf485d0cb7acd2590c0ea98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0041954f600ff92cf485d0c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 20:56:26 2015 +0200 wined3d: Return a texture from the swapchain resource creation callback. --- dlls/d3d11/device.c | 19 ++++++++------- dlls/d3d8/device.c | 24 +++++++------------ dlls/d3d9/device.c | 24 +++++++------------ dlls/ddraw/ddraw.c | 23 +++++++------------ dlls/dxgi/device.c | 10 ++++---- dlls/wined3d/device.c | 39 +++++++++++++++++-------------- dlls/wined3d/swapchain.c | 60 +++++++++++++++++++++++++----------------------- include/wine/wined3d.h | 4 ++-- 8 files changed, 93 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa0041954f600ff92cf48…

1 0

Jacek Caban : oleaut32: Ensure that we' re using the right interface in CreateStub implementation.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: af944cefdfb912eba0d17134f019b0be5b5f1729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af944cefdfb912eba0d17134f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 11:49:30 2015 +0200 oleaut32: Ensure that we're using the right interface in CreateStub implementation. --- dlls/oleaut32/tmarshal.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index a2d1ea1..6608aed 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2282,6 +2282,7 @@ PSFacBuf_CreateStub( ITypeInfo *tinfo; TMStubImpl *stub; TYPEATTR *typeattr; + IUnknown *obj; TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub); @@ -2291,16 +2292,26 @@ PSFacBuf_CreateStub( return hres; } + /* FIXME: This is not exactly right. We should probably call QI later. */ + hres = IUnknown_QueryInterface(pUnkServer, riid, (void**)&obj); + if (FAILED(hres)) { + WARN("Could not get %s iface: %08x\n", debugstr_guid(riid), hres); + obj = pUnkServer; + IUnknown_AddRef(obj); + } + stub = CoTaskMemAlloc(sizeof(TMStubImpl)); - if (!stub) + if (!stub) { + IUnknown_Release(obj); return E_OUTOFMEMORY; + } stub->IRpcStubBuffer_iface.lpVtbl = &tmstubvtbl; stub->ref = 1; stub->tinfo = tinfo; stub->dispatch_stub = NULL; stub->dispatch_derivative = FALSE; stub->iid = *riid; - hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface,pUnkServer); + hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface, obj); *ppStub = &stub->IRpcStubBuffer_iface; TRACE("IRpcStubBuffer: %p\n", stub); if (hres) @@ -2315,6 +2326,7 @@ PSFacBuf_CreateStub( ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); } + IUnknown_Release(obj); return hres; }

1 0

Nikolay Sivov : dwrite: Make CreateFontFace() fail with DWRITE_E_FILEFORMAT for supported types in case of type mismatch.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: fe848b26c7504b2178c02d1212a2172bfba798c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe848b26c7504b2178c02d121… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 4 12:15:41 2015 +0300 dwrite: Make CreateFontFace() fail with DWRITE_E_FILEFORMAT for supported types in case of type mismatch. --- dlls/dwrite/main.c | 5 ++++- dlls/dwrite/tests/font.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ce4299c..c996827 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -818,9 +818,12 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory2 *iface, if (FAILED(hr)) return hr; - if (!is_supported || (face_type != req_facetype)) + if (!is_supported) return E_FAIL; + if (face_type != req_facetype) + return DWRITE_E_FILEFORMAT; + hr = IDWriteFontFile_GetReferenceKey(*font_files, &key, &key_size); if (FAILED(hr)) return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7617dbb..2a625d5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1307,12 +1307,11 @@ if (0) /* crashes on native */ /* try mismatching face type, the one that's not supported */ hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); -todo_wine ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* < win10 */, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_RAW_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); todo_wine

1 0

Nikolay Sivov : dwrite: Make sure same files are scanned once when building font collection.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: b4ce95c1ab06ec57dd240d3501974db97ae73684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ce95c1ab06ec57dd240d350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 23:52:22 2015 +0300 dwrite: Make sure same files are scanned once when building font collection. --- dlls/dwrite/font.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index baa5ace..a181395 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2866,7 +2866,13 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, IDWriteFontCollection **ret) { + struct fontfile_enum { + struct list entry; + IDWriteFontFile *file; + }; + struct fontfile_enum *fileenum, *fileenum2; struct dwrite_fontcollection *collection; + struct list scannedfiles; BOOL current = FALSE; HRESULT hr = S_OK; UINT32 i; @@ -2886,12 +2892,13 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat TRACE("building font collection:\n"); + list_init(&scannedfiles); while (hr == S_OK) { DWRITE_FONT_FACE_TYPE face_type; DWRITE_FONT_FILE_TYPE file_type; + BOOL supported, same = FALSE; IDWriteFontFile *file; UINT32 face_count; - BOOL supported; current = FALSE; hr = IDWriteFontFileEnumerator_MoveNext(enumerator, &current); @@ -2902,6 +2909,17 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; + /* check if we've scanned this file already */ + LIST_FOR_EACH_ENTRY(fileenum, &scannedfiles, struct fontfile_enum, entry) { + if ((same = is_same_fontfile(fileenum->file, file))) + break; + } + + if (same) { + IDWriteFontFile_Release(file); + continue; + } + /* failed font files are skipped */ hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { @@ -2911,6 +2929,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat continue; } + /* add to scanned list */ + fileenum = heap_alloc(sizeof(*fileenum)); + fileenum->file = file; + list_add_tail(&scannedfiles, &fileenum->entry); + for (i = 0; i < face_count; i++) { IDWriteLocalizedStrings *family_name = NULL; struct dwrite_font_data *font_data; @@ -2948,8 +2971,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; } + } - IDWriteFontFile_Release(file); + LIST_FOR_EACH_ENTRY_SAFE(fileenum, fileenum2, &scannedfiles, struct fontfile_enum, entry) { + IDWriteFontFile_Release(fileenum->file); + list_remove(&fileenum->entry); + heap_free(fileenum); } for (i = 0; i < collection->family_count; i++) {

1 0

Florian Pelz : po: German translation: Fix punctuation.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 2fb98b2db3081c96f96c939d2455add0f0b67a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb98b2db3081c96f96c939d2… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:12 2015 +0200 po: German translation: Fix punctuation. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 2be3703..4faf46e 100644 --- a/po/de.po +++ b/po/de.po @@ -10397,7 +10397,7 @@ msgstr " (Ja|Nein|Alle)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"'%1' konnte nicht als interner oder externer Befehl,\n" +"'%1' konnte nicht als interner oder externer Befehl\n" "oder als Batch-Skript erkannt werden.\n" #: cmd.rc:393

1 0

Gerald Pfeifer : include: Define HIDP_STATUS constants via unsigned parameters.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 4349b3c16d0005e00b56a94ad04bc5ec5a8df429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4349b3c16d0005e00b56a94ad… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 27 23:26:46 2015 +0200 include: Define HIDP_STATUS constants via unsigned parameters. --- include/ddk/hidpi.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 527a966..4cfac61 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -151,24 +151,24 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag #define HIDP_ERROR_CODES(sev, code) ((NTSTATUS)(((sev) << 28) | (FACILITY_HID_ERROR_CODE << 16) | (code))) -#define HIDP_STATUS_SUCCESS (HIDP_ERROR_CODES(0x0,0x00)) -#define HIDP_STATUS_NULL (HIDP_ERROR_CODES(0x8,0x01)) -#define HIDP_STATUS_INVALID_PREPARSED_DATA (HIDP_ERROR_CODES(0xc,0x01)) -#define HIDP_STATUS_INVALID_REPORT_TYPE (HIDP_ERROR_CODES(0xc,0x02)) -#define HIDP_STATUS_INVALID_REPORT_LENGTH (HIDP_ERROR_CODES(0xc,0x03)) -#define HIDP_STATUS_USAGE_NOT_FOUND (HIDP_ERROR_CODES(0xc,0x04)) -#define HIDP_STATUS_VALUE_OUT_OF_RANGE (HIDP_ERROR_CODES(0xc,0x05)) -#define HIDP_STATUS_BAD_LOG_PHY_VALUES (HIDP_ERROR_CODES(0xc,0x06)) -#define HIDP_STATUS_BUFFER_TOO_SMALL (HIDP_ERROR_CODES(0xc,0x07)) -#define HIDP_STATUS_INTERNAL_ERROR (HIDP_ERROR_CODES(0xc,0x08)) -#define HIDP_STATUS_I8242_TRANS_UNKNOWN (HIDP_ERROR_CODES(0xc,0x09)) -#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID (HIDP_ERROR_CODES(0xc,0x0a)) -#define HIDP_STATUS_NOT_VALUE_ARRAY (HIDP_ERROR_CODES(0xc,0x0b)) -#define HIDP_STATUS_IS_VALUE_ARRAY (HIDP_ERROR_CODES(0xc,0x0c)) -#define HIDP_STATUS_DATA_INDEX_NOT_FOUND (HIDP_ERROR_CODES(0xc,0x0d)) -#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE (HIDP_ERROR_CODES(0xc,0x0e)) -#define HIDP_STATUS_BUTTON_NOT_PRESSED (HIDP_ERROR_CODES(0xc,0x0f)) -#define HIDP_STATUS_REPORT_DOES_NOT_EXIST (HIDP_ERROR_CODES(0xc,0x10)) -#define HIDP_STATUS_NOT_IMPLEMENTED (HIDP_ERROR_CODES(0xc,0x20)) +#define HIDP_STATUS_SUCCESS (HIDP_ERROR_CODES(0x0u,0x00)) +#define HIDP_STATUS_NULL (HIDP_ERROR_CODES(0x8u,0x01)) +#define HIDP_STATUS_INVALID_PREPARSED_DATA (HIDP_ERROR_CODES(0xcu,0x01)) +#define HIDP_STATUS_INVALID_REPORT_TYPE (HIDP_ERROR_CODES(0xcu,0x02)) +#define HIDP_STATUS_INVALID_REPORT_LENGTH (HIDP_ERROR_CODES(0xcu,0x03)) +#define HIDP_STATUS_USAGE_NOT_FOUND (HIDP_ERROR_CODES(0xcu,0x04)) +#define HIDP_STATUS_VALUE_OUT_OF_RANGE (HIDP_ERROR_CODES(0xcu,0x05)) +#define HIDP_STATUS_BAD_LOG_PHY_VALUES (HIDP_ERROR_CODES(0xcu,0x06)) +#define HIDP_STATUS_BUFFER_TOO_SMALL (HIDP_ERROR_CODES(0xcu,0x07)) +#define HIDP_STATUS_INTERNAL_ERROR (HIDP_ERROR_CODES(0xcu,0x08)) +#define HIDP_STATUS_I8242_TRANS_UNKNOWN (HIDP_ERROR_CODES(0xcu,0x09)) +#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID (HIDP_ERROR_CODES(0xcu,0x0a)) +#define HIDP_STATUS_NOT_VALUE_ARRAY (HIDP_ERROR_CODES(0xcu,0x0b)) +#define HIDP_STATUS_IS_VALUE_ARRAY (HIDP_ERROR_CODES(0xcu,0x0c)) +#define HIDP_STATUS_DATA_INDEX_NOT_FOUND (HIDP_ERROR_CODES(0xcu,0x0d)) +#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE (HIDP_ERROR_CODES(0xcu,0x0e)) +#define HIDP_STATUS_BUTTON_NOT_PRESSED (HIDP_ERROR_CODES(0xcu,0x0f)) +#define HIDP_STATUS_REPORT_DOES_NOT_EXIST (HIDP_ERROR_CODES(0xcu,0x10)) +#define HIDP_STATUS_NOT_IMPLEMENTED (HIDP_ERROR_CODES(0xcu,0x20)) #endif /* __HIDPI_H__ */

1 0

Stefan Dösinger : d3d9/tests: Add more GetBackBuffer error handling tests.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: fc987aaaf6ceac1f66c5e41255d7fd425413a705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc987aaaf6ceac1f66c5e4125… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:54 2015 +0200 d3d9/tests: Add more GetBackBuffer error handling tests. --- dlls/d3d9/tests/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d1a8d37..c41a5e6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1085,6 +1085,18 @@ static void test_swapchain(void) ok(d3dpp.BackBufferCount == 1, "Got unexpected back buffer count %u.\n", d3dpp.BackBufferCount); IDirect3DSwapChain9_Release(swapchain0); + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_MONO, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* IDirect3DDevice9::GetBackBuffer crashes if a NULL output pointer is passed. */ + backbuffer = (void *)0xdeadbeef; + hr = IDirect3DDevice9_GetBackBuffer(device, 1, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + backbuffer = (void *)0xdeadbeef; + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 1, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + /* Check if there is a back buffer */ hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr);

1 0

Józef Kucia : d3d11: Rename d3d10_buffer to d3d_buffer.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 9c907997f002ccd83b40944d70d0b3d814c8e674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c907997f002ccd83b40944d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:52 2015 +0200 d3d11: Rename d3d10_buffer to d3d_buffer. --- dlls/d3d11/buffer.c | 28 ++++++++++++++-------------- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 28 ++++++++++++++-------------- 3 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c907997f002ccd83b409…

1 0