March 2019 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Get rid of handle_edit_load.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 496abd052edad4ba83274aa443c7e4a690ea8dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=496abd052edad4ba83274aa4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:41 2019 +0100 mshtml: Get rid of handle_edit_load. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 5 ----- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 87924c2..00f753c 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -488,11 +488,6 @@ void handle_edit_event(HTMLDocumentNode *doc, nsIDOMEvent *event) nsIDOMKeyEvent_Release(key_event); } -void handle_edit_load(HTMLDocument *This) -{ - get_editor_controller(This->doc_obj->nscontainer); -} - static void set_ns_fontname(HTMLDocumentNode *doc, const char *fontname) { nsICommandParams *nsparam = create_nscommand_params(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6600a1d..b53b1d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -962,7 +962,7 @@ HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSP nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; -void get_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN; +void setup_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) DECLSPEC_HIDDEN; @@ -1140,7 +1140,6 @@ void handle_edit_event(HTMLDocumentNode*,nsIDOMEvent*) DECLSPEC_HIDDEN; HRESULT editor_exec_copy(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_cut(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; -void handle_edit_load(HTMLDocument*) DECLSPEC_HIDDEN; HRESULT browser_is_dirty(GeckoBrowser*) DECLSPEC_HIDDEN; void set_dirty(GeckoBrowser*,VARIANT_BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c07245d..956ba37 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1068,7 +1068,7 @@ HRESULT nsnode_to_nsstring(nsIDOMNode *nsnode, nsAString *str) return hres; } -void get_editor_controller(GeckoBrowser *This) +void setup_editor_controller(GeckoBrowser *This) { nsIEditingSession *editing_session = NULL; nsIControllerContext *ctrlctx; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d25f18e..4fc557d 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -197,7 +197,7 @@ static void handle_docobj_load(HTMLDocumentObj *doc) } if(doc->nscontainer->usermode == EDITMODE) - handle_edit_load(&doc->basedoc); + setup_editor_controller(doc->nscontainer); if(doc->client) { hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd);

1 0

Jacek Caban : mshtml: Move cmdtable_t to HTMLDocumentNode.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 34c84fd1a0a3482f08eb28801a639c7847690010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c84fd1a0a3482f08eb2880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:33 2019 +0100 mshtml: Move cmdtable_t to HTMLDocumentNode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 292 ++++++++++++++++++++----------------------- dlls/mshtml/mshtml_private.h | 10 +- dlls/mshtml/olecmd.c | 265 ++++++++++++++++++++------------------- 3 files changed, 274 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34c84fd1a0a3482f08eb…

1 0

Jacek Caban : mshtml: Move user mode to GeckoBrowser.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: aa4d9190a0c219abc194b2fadae78731a6f1923f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4d9190a0c219abc194b2fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:10:24 2019 +0100 mshtml: Move user mode to GeckoBrowser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 22 +++++++++++----------- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsevents.c | 8 ++++---- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/oleobj.c | 8 ++++---- dlls/mshtml/persist.c | 6 +++--- dlls/mshtml/view.c | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa4d9190a0c219abc194…

1 0

Jacek Caban : mshtml: Pass document node to handle_edit_event.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 53e095c2e83f23602a177339a0617306084cbc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e095c2e83f23602a177339… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:10:39 2019 +0100 mshtml: Pass document node to handle_edit_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 20 ++++++++++---------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsevents.c | 6 ++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 9b1c616..a7943af 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -379,7 +379,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) set_dirty(This->doc_node->browser, VARIANT_TRUE); } -static void handle_arrow_key(HTMLDocument *This, nsIDOMEvent *event, nsIDOMKeyEvent *key_event, const char * const cmds[4]) +static void handle_arrow_key(HTMLDocumentNode *doc, nsIDOMEvent *event, nsIDOMKeyEvent *key_event, const char * const cmds[4]) { int i=0; cpp_bool b; @@ -393,12 +393,12 @@ static void handle_arrow_key(HTMLDocument *This, nsIDOMEvent *event, nsIDOMKeyEv i |= 2; if(cmds[i]) - do_ns_editor_command(This->doc_obj->nscontainer, cmds[i]); + do_ns_editor_command(doc->browser, cmds[i]); nsIDOMEvent_PreventDefault(event); } -void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) +void handle_edit_event(HTMLDocumentNode *doc, nsIDOMEvent *event) { nsIDOMKeyEvent *key_event; UINT32 code; @@ -417,7 +417,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("left\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_RIGHT: { @@ -429,7 +429,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("right\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_UP: { @@ -441,7 +441,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("up\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_DOWN: { @@ -453,7 +453,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("down\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_DELETE: { @@ -464,7 +464,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("delete\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_HOME: { @@ -476,7 +476,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("home\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_END: { @@ -488,7 +488,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("end\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 57edb82..3577607 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1136,7 +1136,7 @@ HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN; /* editor */ HRESULT setup_edit_mode(HTMLDocumentObj*) DECLSPEC_HIDDEN; void init_editor(HTMLDocument*) DECLSPEC_HIDDEN; -void handle_edit_event(HTMLDocument*,nsIDOMEvent*) DECLSPEC_HIDDEN; +void handle_edit_event(HTMLDocumentNode*,nsIDOMEvent*) DECLSPEC_HIDDEN; HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index e1cd414..d25f18e 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -173,17 +173,15 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, { nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; - HTMLDocumentObj *doc_obj; if(!doc || !doc->browser) return NS_ERROR_FAILURE; - doc_obj = doc->basedoc.doc_obj; TRACE("(%p)->(%p)\n", doc, event); - update_doc(doc_obj, UPDATE_UI); + update_doc(doc->browser->doc, UPDATE_UI); if(doc->browser->usermode == EDITMODE) - handle_edit_event(&doc_obj->basedoc, event); + handle_edit_event(doc, event); return NS_OK; }

1 0

Francois Gouget : strmbase: A spelling fix in a comment.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 74c26131b9588e8805217e6a89bf7bae8f331d97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c26131b9588e8805217e6a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 12 13:41:37 2019 +0100 strmbase: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 970164e..456ef83 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -128,7 +128,7 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro #define UPDATE_RUNNING_AVG(avg,val) DO_RUNNING_AVG(avg,val,8) /* the windows for these running averages are experimentally obtained. - * possitive values get averaged more while negative values use a small + * positive values get averaged more while negative values use a small * window so we can react faster to badness. */ #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4)

1 0

Fabian Maurer : comctl32/combo: Fix misleading indentation.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: a51e20f5e075faa4f6809702323f88727308865c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51e20f5e075faa4f6809702… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Mar 12 19:02:31 2019 +0100 comctl32/combo: Fix misleading indentation. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 12ea7bb..8a533e6 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1020,7 +1020,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) else { if (nItems > lphc->visibleItems) - nItems = lphc->visibleItems; + nItems = lphc->visibleItems; nDroppedHeight = nItems * nIHeight + COMBO_YBORDERSIZE(); } }

1 0

Józef Kucia : dxgi: Factor out d3d11_swapchain_get_hwnd().
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: e3ad02bd3ebf7b3a186edbf4db09a79cba30dd50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ad02bd3ebf7b3a186edbf4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 12 16:30:21 2019 +0100 dxgi: Factor out d3d11_swapchain_get_hwnd(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1998e48..47f7196 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -150,6 +150,17 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) +{ + struct wined3d_swapchain_desc wined3d_desc; + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + return wined3d_desc.device_window; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -490,7 +501,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_desc swapchain_desc; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; @@ -511,11 +521,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh if (SUCCEEDED(hr)) { - wined3d_mutex_lock(); - wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); - wined3d_mutex_unlock(); - - hr = dxgi_get_output_from_window(adapter, swapchain_desc.device_window, output); + HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); + hr = dxgi_get_output_from_window(adapter, hwnd, output); IDXGIAdapter_Release(adapter); } else @@ -611,7 +618,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenDesc(IDXGISwapChai static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetHwnd(IDXGISwapChain1 *iface, HWND *hwnd) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_desc wined3d_desc; TRACE("iface %p, hwnd %p.\n", iface, hwnd); @@ -621,11 +627,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetHwnd(IDXGISwapChain1 *iface, return DXGI_ERROR_INVALID_CALL; } - wined3d_mutex_lock(); - wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); - wined3d_mutex_unlock(); - - *hwnd = wined3d_desc.device_window; + *hwnd = d3d11_swapchain_get_hwnd(swapchain); return S_OK; }

1 0

Francois Gouget : mfplat/tests: Fix the trailing '\n's in ok() messages.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 1b9573c84e2c9ef801272d7f67c8d9a12a17b1bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9573c84e2c9ef801272d7f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 12 13:42:44 2019 +0100 mfplat/tests: Fix the trailing '\n's in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ca00ac1..aa8029c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1073,9 +1073,9 @@ static void test_MFCreateAsyncResult(void) ok(state == (IUnknown *)result, "Unexpected state.\n"); refcount = IMFAsyncResult_Release(result2); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Event handle is closed on release. */ hr = MFCreateAsyncResult(NULL, NULL, NULL, &result); @@ -1088,7 +1088,7 @@ static void test_MFCreateAsyncResult(void) ok(ret, "Failed to get handle info.\n"); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); ret = GetHandleInformation(event, &flags); ok(!ret, "Expected handle to be closed.\n"); @@ -1102,7 +1102,7 @@ static void test_MFCreateAsyncResult(void) ok(ret, "Failed to get handle info.\n"); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); ret = GetHandleInformation(event, &flags); ok(!ret, "Expected handle to be closed.\n"); } @@ -1835,7 +1835,7 @@ static void test_MFInvokeCallback(void) ok(ret == WAIT_TIMEOUT, "Expected timeout, ret %#x.\n", ret); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Francois Gouget : gdi32: Fix the FreeType case in a comment.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 5f79b5f6e54647f7442ae1983bd595e070088e5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f79b5f6e54647f7442ae198… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 12 13:42:19 2019 +0100 gdi32: Fix the FreeType case in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 098faff..68d232e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4178,7 +4178,7 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); - /* In Freetype < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ + /* In FreeType < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ if (pFT_Property_Set && FT_SimpleVersion < FT_VERSION_VALUE(2, 8, 1)) { FT_UInt interpreter_version = 35;

1 0

Jacek Caban : mshtml: Move IsDirty implementation to GeckoBrowser.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 1ea4924e4669e8ab01c77c2bb91d0c083f5c81ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ea4924e4669e8ab01c77c2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:10 2019 +0100 mshtml: Move IsDirty implementation to GeckoBrowser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 7 +++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/persist.c | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index a7943af..5f59284 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1223,15 +1223,14 @@ void init_editor(HTMLDocument *This) set_ns_fontname(This, "Times New Roman"); } -HRESULT editor_is_dirty(HTMLDocument *This) +HRESULT browser_is_dirty(GeckoBrowser *browser) { cpp_bool modified; - if(!This->doc_obj->nscontainer || !This->doc_obj->nscontainer->editor) + if(browser->usermode != EDITMODE || !browser->editor) return S_FALSE; - nsIEditor_GetDocumentModified(This->doc_obj->nscontainer->editor, &modified); - + nsIEditor_GetDocumentModified(browser->editor, &modified); return modified ? S_OK : S_FALSE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3577607..9933a41 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1141,7 +1141,7 @@ HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; void handle_edit_load(HTMLDocument*) DECLSPEC_HIDDEN; -HRESULT editor_is_dirty(HTMLDocument*) DECLSPEC_HIDDEN; +HRESULT browser_is_dirty(GeckoBrowser*) DECLSPEC_HIDDEN; void set_dirty(GeckoBrowser*,VARIANT_BOOL) DECLSPEC_HIDDEN; extern DWORD mshtml_tls DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index cd52ac9..a798650 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -884,10 +884,7 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) TRACE("(%p)\n", This); - if(This->doc_obj->nscontainer->usermode == EDITMODE) - return editor_is_dirty(This); - - return S_FALSE; + return browser_is_dirty(This->doc_obj->nscontainer); } static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *pStm)

1 0