August 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : reg/tests: Free the WCHAR memory buffer if CreateFile() fails.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: e0a97d32e24528128b874641393107bac0591fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a97d32e24528128b8746413… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 23 12:31:56 2017 +0000 reg/tests: Free the WCHAR memory buffer if CreateFile() fails. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0a2fdbf..f6a7ce1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -771,8 +771,11 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (regfile == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, wstr); return FALSE; + } ret = WriteFile(regfile, wstr, memsize, &written, NULL); lok(ret, "WriteFile failed: %u\n", GetLastError());

1 0

Nikolay Sivov : dwrite: Split initial cluster computation by stage.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 072a9b00cffd81599f40cd53a1bc38b27556f40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=072a9b00cffd81599f40cd53a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 12:42:11 2017 +0300 dwrite: Split initial cluster computation by stage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 5 +- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 374 ++++++++++++++++++++++++------------------- dlls/dwrite/main.c | 6 +- 4 files changed, 215 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=072a9b00cffd81599f40c…

1 0

Nikolay Sivov : dwrite: Set drawing effect for trimming sign.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 5a70c58acd3d06ab610af8023dbaa75e4f987769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a70c58acd3d06ab610af8023… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 12:42:10 2017 +0300 dwrite: Set drawing effect for trimming sign. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9bf8d8d..76c3ad9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -20,6 +20,7 @@ #define COBJMACROS +#include <assert.h> #include <stdarg.h> #include <math.h> @@ -164,8 +165,7 @@ struct regular_layout_run { UINT16 *clustermap; FLOAT *advances; DWRITE_GLYPH_OFFSET *offsets; - /* this is actual glyph count after shaping, it's not necessary the same as reported to Draw() */ - UINT32 glyphcount; + UINT32 glyphcount; /* actual glyph count after shaping, not necessarily the same as reported to Draw() */ }; struct layout_run { @@ -177,6 +177,7 @@ struct layout_run { } u; FLOAT baseline; FLOAT height; + UINT32 start_position; /* run text position in range [0, layout-text-length) */ }; struct layout_effective_run { @@ -487,7 +488,7 @@ static BOOL is_run_rtl(const struct layout_effective_run *run) return run->run->u.regular.run.bidiLevel & 1; } -static struct layout_run *alloc_layout_run(enum layout_run_kind kind) +static struct layout_run *alloc_layout_run(enum layout_run_kind kind, UINT32 start_position) { struct layout_run *ret; @@ -500,6 +501,7 @@ static struct layout_run *alloc_layout_run(enum layout_run_kind kind) ret->u.regular.sa.script = Script_Unknown; ret->u.regular.sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; } + ret->start_position = start_position; return ret; } @@ -695,6 +697,8 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s const struct regular_layout_run *run = &r->u.regular; UINT32 i, start = 0; + assert(r->kind == LAYOUT_RUN_REGULAR); + for (i = 0; i < run->descr.stringLength; i++) { BOOL end = i == run->descr.stringLength - 1; @@ -781,7 +785,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) return hr; - r = alloc_layout_run(LAYOUT_RUN_INLINE); + r = alloc_layout_run(LAYOUT_RUN_INLINE, range->h.range.startPosition); if (!r) return E_OUTOFMEMORY; @@ -891,13 +895,14 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) struct layout_run *nextr; /* keep mapped part for current run, add another run for the rest */ - nextr = alloc_layout_run(LAYOUT_RUN_REGULAR); + nextr = alloc_layout_run(LAYOUT_RUN_REGULAR, 0); if (!nextr) return E_OUTOFMEMORY; *nextr = *r; + nextr->start_position = run->descr.textPosition + mapped_length; nextrun = &nextr->u.regular; - nextrun->descr.textPosition = run->descr.textPosition + mapped_length; + nextrun->descr.textPosition = nextr->start_position; nextrun->descr.stringLength = run->descr.stringLength - mapped_length; nextrun->descr.string = &layout->str[nextrun->descr.textPosition]; run->descr.stringLength = mapped_length; @@ -1228,7 +1233,8 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const inlineobject->line = line; /* effect assigned from start position and on is used for inline objects */ - inlineobject->effect = layout_get_effect_from_pos(layout, layout->clusters[first_cluster].position); + inlineobject->effect = layout_get_effect_from_pos(layout, layout->clusters[first_cluster].position + + layout->clusters[first_cluster].run->start_position); list_add_tail(&layout->inlineobjects, &inlineobject->entry); return S_OK; @@ -1886,7 +1892,8 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust trimming_sign->is_rtl = FALSE; trimming_sign->line = line; - trimming_sign->effect = NULL; /* FIXME */ + trimming_sign->effect = layout_get_effect_from_pos(layout, layout->clusters[i].position + + layout->clusters[i].run->start_position); list_add_tail(&layout->inlineobjects, &trimming_sign->entry); } @@ -4504,7 +4511,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysi TRACE("[%u,%u) script=%u:%s\n", position, position + length, sa->script, debugstr_sa_script(sa->script)); - run = alloc_layout_run(LAYOUT_RUN_REGULAR); + run = alloc_layout_run(LAYOUT_RUN_REGULAR, position); if (!run) return E_OUTOFMEMORY; @@ -4564,7 +4571,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink /* all fully covered runs are processed at this point, reuse existing run for remaining reported bidi range and add another run for the rest of original one */ - run = alloc_layout_run(LAYOUT_RUN_REGULAR); + run = alloc_layout_run(LAYOUT_RUN_REGULAR, position + length); if (!run) return E_OUTOFMEMORY;

1 0

Jacek Caban : mshtml: Return documentMode as VT_R4.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: bec8063948e64f32c85021381a8bea590de9d38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec8063948e64f32c85021381… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 21 21:34:47 2017 +0200 mshtml: Return documentMode as VT_R4. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c216448..3c16d2c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3103,8 +3103,8 @@ static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARI return E_UNEXPECTED; } - V_VT(p) = VT_I4; - V_I4(p) = compat_mode_info[This->doc_node->document_mode].document_mode; + V_VT(p) = VT_R4; + V_R4(p) = compat_mode_info[This->doc_node->document_mode].document_mode; return S_OK; }

1 0

Jacek Caban : jscript: Added support for VT_R4 VARIANT types.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: c25208f2af32c05d59cbdfa5946b1f74362030ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25208f2af32c05d59cbdfa59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 21 21:34:39 2017 +0200 jscript: Added support for VT_R4 VARIANT types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index e7100ba..edfebcf 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -303,6 +303,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_UI4: *r = jsval_number(V_UI4(var)); return S_OK; + case VT_R4: + *r = jsval_number(V_R4(var)); + return S_OK; case VT_UNKNOWN: if(V_UNKNOWN(var)) { IDispatch *disp; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ff6edce..1d42c54 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[6], v; + VARIANT args[7], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1355,6 +1355,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_UI4(args+4) = 0xffffffff; V_VT(args+5) = VT_BYREF|VT_VARIANT; V_VARIANTREF(args+5) = &v; + V_VT(args+6) = VT_R4; + V_R4(args+6) = 0.5; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2644,7 +2646,8 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," + "function(r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2654,6 +2657,8 @@ static BOOL run_tests(void) " ok(ui4 > 0, 'ui4 = ' + ui4);" " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" " ok(i4ref === 2, 'i4ref = ' + i4ref);" + " ok(r4 === 0.5, 'r4 = ' + r4);" + " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Huw Davies : riched20: Use the implementation of EM_PASTESPECIAL for WM_PASTE.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 46fef3daa1b52f7d3df3faffa8b913585f61ca24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fef3daa1b52f7d3df3faffa… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:49 2017 +0100 riched20: Use the implementation of EM_PASTESPECIAL for WM_PASTE. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5f9da92..383b307 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2309,33 +2309,6 @@ done: return hr == S_OK; } -static BOOL ME_Paste(ME_TextEditor *editor) -{ - DWORD dwFormat = 0; - EDITSTREAM es; - ME_GlobalDestStruct gds; - UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); - UINT cf = 0; - - if (IsClipboardFormatAvailable(nRTFFormat)) - cf = nRTFFormat, dwFormat = SF_RTF; - else if (IsClipboardFormatAvailable(CF_UNICODETEXT)) - cf = CF_UNICODETEXT, dwFormat = SF_TEXT|SF_UNICODE; - else - return FALSE; - - if (!OpenClipboard(editor->hWnd)) - return FALSE; - gds.hData = GetClipboardData(cf); - gds.nLength = 0; - es.dwCookie = (DWORD_PTR)&gds; - es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; - ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); - - CloseClipboard(); - return TRUE; -} - static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) { LPDATAOBJECT dataObj = NULL; @@ -2649,7 +2622,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) break; case 'V': if (ctrl_is_down) - return ME_Paste(editor); + return paste_special( editor, 0, NULL, FALSE ); break; case 'C': case 'X': @@ -4076,8 +4049,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_PASTE: case WM_MBUTTONDOWN: - ME_Paste(editor); - return 0; + wParam = 0; + lParam = 0; + /* fall through */ case EM_PASTESPECIAL: paste_special( editor, wParam, (REPASTESPECIAL *)lParam, FALSE ); return 0;

1 0

Huw Davies : riched20: Initialize ME_TextEditor members in ME_MakeEditor() .
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 1bc48be4a78a1991c0d6c04d7a12f0cc438f0211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc48be4a78a1991c0d6c04d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:46 2017 +0100 riched20: Initialize ME_TextEditor members in ME_MakeEditor(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 ++ dlls/riched20/txtsrv.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3cd80be..51b0cad 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2898,6 +2898,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; + ed->exStyleFlags = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD| @@ -2958,6 +2959,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) } ME_CheckCharOffsets(ed); + SetRectEmpty(&ed->rcFormat); ed->bDefaultFormatRect = TRUE; ITextHost_TxGetSelectionBarWidth(ed->texthost, &selbarwidth); if (selbarwidth) { diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 2a2149e..eb61e4e 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -414,8 +414,6 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); - ITextImpl->editor->exStyleFlags = 0; - SetRectEmpty(&ITextImpl->editor->rcFormat); if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter;

1 0

Huw Davies : riched20: Move the editor initialization out of CreateTextHost().
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 4cb7578d0b32dd8f8aec58077156076c9d1810ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb7578d0b32dd8f8aec58077… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:44 2017 +0100 riched20: Move the editor initialization out of CreateTextHost(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 32 ++++++++++++++++++++++++++------ dlls/riched20/txthost.c | 23 +++++++---------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1ce444e..f5b9e4c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4792,6 +4792,30 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0L; } +static BOOL create_windowed_editor(HWND hwnd, CREATESTRUCTW *create, BOOL emulate_10) +{ + ITextHost *host = ME_CreateTextHost( hwnd, create, emulate_10 ); + ME_TextEditor *editor; + + if (!host) return FALSE; + + editor = ME_MakeEditor( host, emulate_10, create->style ); + if (!editor) + { + ITextHost_Release( host ); + return FALSE; + } + + editor->exStyleFlags = GetWindowLongW( hwnd, GWL_EXSTYLE ); + editor->styleFlags |= GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN; + editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ + editor->hwndParent = create->hwndParent; + + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)editor ); + + return TRUE; +} + static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) { @@ -4808,11 +4832,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (msg == WM_NCCREATE) { CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; - ITextHost *texthost; TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); - texthost = ME_CreateTextHost(hWnd, pcs, FALSE); - return texthost != NULL; + return create_windowed_editor( hWnd, pcs, FALSE ); } else { @@ -4938,12 +4960,10 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM { if (msg == WM_NCCREATE && !GetWindowLongPtrW(hWnd, 0)) { - ITextHost *texthost; CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); - texthost = ME_CreateTextHost(hWnd, pcs, TRUE); - return texthost != NULL; + return create_windowed_editor( hWnd, pcs, TRUE ); } return RichEditANSIWndProc(hWnd, msg, wParam, lParam); } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 0e51ecf..ccd554d 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -45,23 +45,14 @@ static const ITextHostVtbl textHostVtbl; ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) { ITextHostImpl *texthost; + texthost = CoTaskMemAlloc(sizeof(*texthost)); - if (texthost) - { - ME_TextEditor *editor; - - texthost->ITextHost_iface.lpVtbl = &textHostVtbl; - texthost->ref = 1; - texthost->hWnd = hwnd; - texthost->bEmulateVersion10 = bEmulateVersion10; - - editor = ME_MakeEditor(&texthost->ITextHost_iface, bEmulateVersion10, cs->style); - editor->exStyleFlags = GetWindowLongW(hwnd, GWL_EXSTYLE); - editor->styleFlags |= GetWindowLongW(hwnd, GWL_STYLE) & ES_WANTRETURN; - editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ - editor->hwndParent = cs->hwndParent; - SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor); - } + if (!texthost) return NULL; + + texthost->ITextHost_iface.lpVtbl = &textHostVtbl; + texthost->ref = 1; + texthost->hWnd = hwnd; + texthost->bEmulateVersion10 = bEmulateVersion10; return &texthost->ITextHost_iface; }

1 0

Anton Romanov : windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 267bca1f3b17ee22ba24972ad10757d997d01a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267bca1f3b17ee22ba24972ad… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sun Aug 20 23:40:50 2017 -0700 windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index e8325c7..815125fd 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1327,6 +1327,7 @@ struct png_pixelformat { }; static const struct png_pixelformat formats[] = { + {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, {&GUID_WICPixelFormat24bppBGR, 24, 8, PNG_COLOR_TYPE_RGB, 0, 1}, {&GUID_WICPixelFormatBlackWhite, 1, 1, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat2bppGray, 2, 2, PNG_COLOR_TYPE_GRAY, 0, 0}, @@ -1334,7 +1335,6 @@ static const struct png_pixelformat formats[] = { {&GUID_WICPixelFormat8bppGray, 8, 8, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat16bppGray, 16, 16, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, - {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, {NULL},

1 0

Jacek Caban : mshtml.idl: Added IHTMLDocument8 declaration.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 95fa2733e5f5fce28ef9cd5b3f2735f9055267b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fa2733e5f5fce28ef9cd5b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 22 17:55:36 2017 +0200 mshtml.idl: Added IHTMLDocument8 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++- include/mshtml.idl | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95fa2733e5f5fce28ef9c…

1 0