wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Ken Thomases : winemac: Use NSMouseInRect() instead of NSPointInRect() to compensate for Cocoa's off-by-one coordinate system.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 018d629b3cc6bf1d8424a73bbb00279223bfb323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018d629b3cc6bf1d8424a73bb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:53:21 2013 -0500 winemac: Use NSMouseInRect() instead of NSPointInRect() to compensate for Cocoa's off-by-one coordinate system. This matches what Cocoa does when determining how to handle an event so that, for example, our test if a click is in the window grow box corresponds to whether Cocoa will run an internal mouse-tracking loop to resize the window when we pass it the event. This fixes a problem where both Cocoa and user32 would try to run a resize loop and the cursor would get "stuck" resizing the window after the button was released. --- dlls/winemac.drv/cocoa_app.m | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 615a9ab..afe0608 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1550,7 +1550,7 @@ int macdrv_err_on; // Test if the click was in the window's content area. NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; - process = NSPointInRect(nspoint, contentRect); + process = NSMouseInRect(nspoint, contentRect, NO); if (process && [window styleMask] & NSResizableWindowMask) { // Ignore clicks in the grow box (resize widget). @@ -1573,7 +1573,7 @@ int macdrv_err_on; NSMinY(contentRect), bounds.size.width, bounds.size.height); - process = !NSPointInRect(nspoint, growBox); + process = !NSMouseInRect(nspoint, growBox, NO); } } } @@ -1643,7 +1643,7 @@ int macdrv_err_on; // Only process the event if it was in the window's content area. NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; - process = NSPointInRect(nspoint, contentRect); + process = NSMouseInRect(nspoint, contentRect, NO); } if (process)

1 0

Joško Nikolić : po: Update Croatian translation.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: e5f61e6eaf479c086e935c7c4e44a7e33f689519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f61e6eaf479c086e935c7c4… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Thu Sep 19 04:32:44 2013 +0000 po: Update Croatian translation. --- po/hr.po | 506 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 259 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5f61e6eaf479c086e935…

1 0

Aric Stewart : imm32: Fix ImmGetDescription behavior with a null HKL.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 8b933495fb4b9a874b9f1f3560847739520ba384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b933495fb4b9a874b9f1f356… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 17 13:52:23 2013 -0500 imm32: Fix ImmGetDescription behavior with a null HKL. --- dlls/imm32/imm.c | 3 +++ dlls/imm32/tests/imm32.c | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 59e7ff2..29bf4af 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1523,6 +1523,8 @@ UINT WINAPI ImmGetDescriptionA( /* find out how many characters in the unicode buffer */ len = ImmGetDescriptionW( hKL, NULL, 0 ); + if (!len) + return 0; /* allocate a buffer of that size */ buf = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR) ); @@ -1550,6 +1552,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); + if (!hKL) return 0; if (!uBufLen) return lstrlenW( name ); lstrcpynW( lpszDescription, name, uBufLen ); return lstrlenW( lpszDescription ); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7abc4c3..7162f82 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -629,18 +629,19 @@ static void test_ImmGetContext(void) static void test_ImmGetDescription(void) { HKL hkl; - WCHAR japime[] = { 'E', '0', '0', '1', '0', '4', '1', '1', 0 }; WCHAR descW[100]; CHAR descA[100]; UINT ret, lret; /* FIXME: invalid keyboard layouts should not pass */ ret = ImmGetDescriptionW(NULL, NULL, 0); - todo_wine ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + ret = ImmGetDescriptionA(NULL, NULL, 0); + ok(!ret, "ImmGetDescriptionA failed, expected 0 received %d.\n", ret); /* load a language with valid IMM descriptions */ - hkl = LoadKeyboardLayoutW(japime, KLF_ACTIVATE); - todo_wine ok(hkl != 0, "LoadKeyboardLayoutW failed, expected != 0.\n"); + hkl = GetKeyboardLayout(0); + ok(hkl != 0, "GetKeyboardLayout failed, expected != 0.\n"); ret = ImmGetDescriptionW(hkl, NULL, 0); if(!ret) @@ -649,6 +650,12 @@ static void test_ImmGetDescription(void) return; } + SetLastError(0xdeadcafe); + ret = ImmGetDescriptionW(0, NULL, 100); + ok (ret == 0, "ImmGetDescriptionW with 0 hkl should return 0\n"); + ret = GetLastError(); + ok (ret == 0xdeadcafe, "Last Error should remain unchanged\n"); + ret = ImmGetDescriptionW(hkl, descW, 0); ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n");

1 0

Qian Hong : imm32: Validate input context in multiple IMC functions.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: b4b428ee9e7cdffe6f49c2d539107fbb9d002895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b428ee9e7cdffe6f49c2d53… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Sep 17 22:52:02 2013 +0800 imm32: Validate input context in multiple IMC functions. Both tests and fixes improved by Aric Stewart. --- dlls/imm32/imm.c | 166 ++++++++++++++----- dlls/imm32/tests/imm32.c | 405 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 523 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b428ee9e7cdffe6f49c…

1 0

Ken Thomases : winemac: Send WM_ENTER/EXITSIZEMOVE messages at start/ end of a resizing operation.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 4ad9d5f04affb22f6e3724b66da814088a89c897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad9d5f04affb22f6e3724b66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:01:03 2013 -0500 winemac: Send WM_ENTER/EXITSIZEMOVE messages at start/end of a resizing operation. --- dlls/winemac.drv/cocoa_window.m | 7 +++++++ dlls/winemac.drv/event.c | 4 ++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 16 ++++++++++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d833d04..a602adb 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1476,6 +1476,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowDidEndLiveResize:(NSNotification *)notification { + macdrv_query* query = macdrv_create_query(); + query->type = QUERY_RESIZE_END; + query->window = (macdrv_window)[self retain]; + + [self.queue query:query timeout:0.3]; + macdrv_release_query(query); + self.liveResizeDisplayTimer = nil; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 97f1e3b..709079a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -146,6 +146,10 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; + case QUERY_RESIZE_END: + TRACE("QUERY_RESIZE_END\n"); + success = query_resize_end(hwnd); + break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d308e69..a0e0b52 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -161,6 +161,7 @@ extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_did_minimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; +extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 71d8c9f..2f26b34 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -272,6 +272,7 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, + QUERY_RESIZE_END, QUERY_RESIZE_START, NUM_QUERY_TYPES }; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 411270c..4cb8082 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1991,6 +1991,22 @@ fail: BOOL query_resize_start(HWND hwnd) { TRACE("hwnd %p\n", hwnd); + sync_window_min_max_info(hwnd); + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); + + return TRUE; +} + + +/*********************************************************************** + * query_resize_end + * + * Handler for QUERY_RESIZE_END query. + */ +BOOL query_resize_end(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); return TRUE; }

1 0

Ken Thomases : winemac: At the start of a resize operation, get window min/ max size info and pass it to Cocoa.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: a3197b8ad09c92c2af463d1a30ecf15c3ed98ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3197b8ad09c92c2af463d1a3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:00:37 2013 -0500 winemac: At the start of a resize operation, get window min/max size info and pass it to Cocoa. --- dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 52 ++++++++++++--- dlls/winemac.drv/event.c | 4 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 + dlls/winemac.drv/window.c | 136 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3197b8ad09c92c2af463…

1 0

Ken Thomases : winemac: Move memory management of liveResizeDisplayTimer into property setter.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: d55d2ec85a769fb5d41b61e3b64ee773bf32880c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55d2ec85a769fb5d41b61e3b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:00:51 2013 -0500 winemac: Move memory management of liveResizeDisplayTimer into property setter. --- dlls/winemac.drv/cocoa_window.m | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e8ac79c..d833d04 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -158,6 +158,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @property (assign, nonatomic) void* imeData; @property (nonatomic) BOOL commandDone; +@property (retain, nonatomic) NSTimer* liveResizeDisplayTimer; + - (void) updateColorSpace; - (BOOL) becameEligibleParentOrChild; @@ -468,6 +470,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; + @synthesize liveResizeDisplayTimer; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -1183,6 +1186,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self checkTransparency]; } + - (void) setLiveResizeDisplayTimer:(NSTimer*)newTimer + { + if (newTimer != liveResizeDisplayTimer) + { + [liveResizeDisplayTimer invalidate]; + [liveResizeDisplayTimer release]; + liveResizeDisplayTimer = [newTimer retain]; + } + } + - (void) makeFocused:(BOOL)activate { [self orderBelow:nil orAbove:nil activate:activate]; @@ -1463,9 +1476,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowDidEndLiveResize:(NSNotification *)notification { - [liveResizeDisplayTimer invalidate]; - [liveResizeDisplayTimer release]; - liveResizeDisplayTimer = nil; + self.liveResizeDisplayTimer = nil; } - (void)windowDidMiniaturize:(NSNotification *)notification @@ -1587,13 +1598,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) // // We address this by "manually" asking our windows to check if they need // redrawing every so often (during live resize only). - [self windowDidEndLiveResize:nil]; - liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 - target:self - selector:@selector(displayIfNeeded) - userInfo:nil - repeats:YES]; - [liveResizeDisplayTimer retain]; + self.liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 + target:self + selector:@selector(displayIfNeeded) + userInfo:nil + repeats:YES]; [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer forMode:NSRunLoopCommonModes]; }

1 0

Jacek Caban : ieframe: Added IWebBrowserPriv2IE8 stub implementation.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 040e47feced802cee1eecf5c532673eb944cc9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040e47feced802cee1eecf5c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 16:58:13 2013 +0200 ieframe: Added IWebBrowserPriv2IE8 stub implementation. --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ include/mshtml.idl | 37 ++++++++++++++++ 3 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 777ecf9..b7da8ff 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -58,6 +58,7 @@ typedef struct { IHlinkFrame IHlinkFrame_iface; ITargetFrame2 ITargetFrame2_iface; ITargetFramePriv2 ITargetFramePriv2_iface; + IWebBrowserPriv2IE8 IWebBrowserPriv2IE8_iface; IUnknown *outer; DocHost *doc_host; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index d730b10..b57ec4b 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1451,6 +1451,109 @@ static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = { TargetFramePriv2_AggregatedNavigation2 }; +static inline HlinkFrame *impl_from_IWebBrowserPriv2IE8(IWebBrowserPriv2IE8 *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, IWebBrowserPriv2IE8_iface); +} + +static HRESULT WINAPI WebBrowserPriv2IE8_QueryInterface(IWebBrowserPriv2IE8 *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI WebBrowserPriv2IE8_AddRef(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI WebBrowserPriv2IE8_Release(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE8 *iface, IUri *uri, VARIANT *flags, + VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p %s %s %s %s %p %s)\n", This, uri, debugstr_variant(flags), debugstr_variant(target_frame), + debugstr_variant(post_data), debugstr_variant(headers), bind_ctx, debugstr_w(url_fragment)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_SetBrowserFrameOptions(IWebBrowserPriv2IE8 *iface, DWORD opt1, DWORD opt2) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%x %x)\n", This, opt1, opt2); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_DetachConnectionPoints(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_GetProcessId(IWebBrowserPriv2IE8 *iface, DWORD *pid) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p)\n", This, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_CompatAttachEditEvents(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_HandleOpenOptions(IWebBrowserPriv2IE8 *iface, IUnknown *obj, BSTR bstr, int options) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p %s %x)\n", This, obj, debugstr_w(bstr), options); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_SetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR term) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(term)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_GetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR *term) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p)\n", This, term); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_GetCurrentDocument(IWebBrowserPriv2IE8 *iface, IDispatch **doc) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p)\n", This, doc); + return E_NOTIMPL; +} + +static const IWebBrowserPriv2IE8Vtbl WebBrowserPriv2IE8Vtbl = { + WebBrowserPriv2IE8_QueryInterface, + WebBrowserPriv2IE8_AddRef, + WebBrowserPriv2IE8_Release, + WebBrowserPriv2IE8_NavigateWithBindCtx2, + WebBrowserPriv2IE8_SetBrowserFrameOptions, + WebBrowserPriv2IE8_DetachConnectionPoints, + WebBrowserPriv2IE8_GetProcessId, + WebBrowserPriv2IE8_CompatAttachEditEvents, + WebBrowserPriv2IE8_HandleOpenOptions, + WebBrowserPriv2IE8_SetSearchTerm, + WebBrowserPriv2IE8_GetSearchTerm, + WebBrowserPriv2IE8_GetCurrentDocument +}; + BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkFrame, riid)) { @@ -1465,6 +1568,9 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_ITargetFramePriv2, riid)) { TRACE("(%p)->(IID_ITargetFramePriv2 %p)\n", This, ppv); *ppv = &This->ITargetFramePriv2_iface; + }else if(IsEqualGUID(&IID_IWebBrowserPriv2IE8, riid)) { + TRACE("(%p)->(IID_IWebBrowserPriv2IE8 %p)\n", This, ppv); + *ppv = &This->IWebBrowserPriv2IE8_iface; }else { return FALSE; } @@ -1478,6 +1584,7 @@ void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; + This->IWebBrowserPriv2IE8_iface.lpVtbl = &WebBrowserPriv2IE8Vtbl; This->outer = outer; This->doc_host = doc_host; diff --git a/include/mshtml.idl b/include/mshtml.idl index f64eb98..19607d1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18516,3 +18516,40 @@ interface IHTMLPrivateWindow : IUnknown HRESULT FindWindowByName(LPCWSTR name, IHTMLWindow2 **ret); HRESULT GetAddressBarUrl(BSTR *url); } + +/***************************************************************************** + * IWebBrowserPriv interface + */ +[ + object, + uuid(3050f804-98b5-11cf-bb82-00aa00bdce0b), + local +] +interface IWebBrowserPriv : IUnknown +{ + HRESULT NavigateWithBindCtx(VARIANT *uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment); + HRESULT OnClose(); +} + +/***************************************************************************** + * IWebBrowserPriv2IE8 interface + */ +[ + object, + uuid(3ed72303-6ffc-4214-ba90-faf1862dec8a), + local +] +interface IWebBrowserPriv2IE8 : IUnknown +{ + HRESULT NavigateWithBindCtx2(IUri *uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment); + HRESULT SetBrowserFrameOptions(DWORD opt1, DWORD opt2); + HRESULT DetachConnectionPoints(); + HRESULT GetProcessId(DWORD *pid); + HRESULT CompatAttachEditEvents(); + HRESULT HandleOpenOptions(IUnknown *obj, BSTR bstr, int options); + HRESULT SetSearchTerm(BSTR term); + HRESULT GetSearchTerm(BSTR *term); + HRESULT GetCurrentDocument(IDispatch** doc); +}

1 0

Jacek Caban : mshtml: Moved Exec(DOCHOST_DOCCANNAVIGATE) call to separated function.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 42c1b3936da43e7b946f9d298a5dfab95aeecaf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c1b3936da43e7b946f9d298… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 16:57:56 2013 +0200 mshtml: Moved Exec(DOCHOST_DOCCANNAVIGATE) call to separated function. --- dlls/mshtml/oleobj.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index ac15cdf..fded548 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -210,6 +210,22 @@ void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } +static void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) +{ + VARIANT var; + + if(!doc->client_cmdtrg) + return; + + if(doc_can_navigate) { + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&doc->basedoc.window->base.IHTMLWindow2_iface; + } + + IOleCommandTarget_Exec(doc->client_cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, + doc_can_navigate ? &var : NULL, NULL); +} + static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { HTMLDocument *This = impl_from_IOleObject(iface); @@ -359,9 +375,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IDocObjectService *doc_object_service; IWebBrowser2 *wb; - V_VT(&var) = VT_UNKNOWN; - V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface; - IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); + set_document_navigation(This->doc_obj, TRUE); if(browser_service) { hres = IBrowserService_QueryInterface(browser_service,

1 0

Huw Davies : iphlpapi: Add helpers to convert the host' s sockaddr structures to SOCKADDR_STORAGE.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: f8463f28a9b62886c200c5a09ef02d94f7b39723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8463f28a9b62886c200c5a09… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 18 11:49:16 2013 +0100 iphlpapi: Add helpers to convert the host's sockaddr structures to SOCKADDR_STORAGE. --- dlls/iphlpapi/iphlpapi_main.c | 51 ++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f84c700..e2d09eb 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -925,6 +925,30 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } +static void sockaddr_in_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in *src ) +{ + SOCKADDR_IN *s = (SOCKADDR_IN *)dst; + + s->sin_family = WS_AF_INET; + s->sin_port = src->sin_port; + memcpy( &s->sin_addr, &src->sin_addr, sizeof(IN_ADDR) ); + memset( (char *)s + FIELD_OFFSET( SOCKADDR_IN, sin_zero ), 0, + sizeof(SOCKADDR_STORAGE) - FIELD_OFFSET( SOCKADDR_IN, sin_zero) ); +} + +static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in6 *src ) +{ + SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)dst; + + s->sin6_family = WS_AF_INET6; + s->sin6_port = src->sin6_port; + s->sin6_flowinfo = src->sin6_flowinfo; + memcpy( &s->sin6_addr, &src->sin6_addr, sizeof(IN6_ADDR) ); + s->sin6_scope_id = src->sin6_scope_id; + memset( (char *)s + sizeof(SOCKADDR_IN6), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); +} + #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ @@ -957,22 +981,13 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) #ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 if (_res._u._ext.nsaddrs[i]) { - SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; if (ip4_only) continue; - s->sin6_family = WS_AF_INET6; - s->sin6_port = _res._u._ext.nsaddrs[i]->sin6_port; - s->sin6_flowinfo = _res._u._ext.nsaddrs[i]->sin6_flowinfo; - memcpy( &s->sin6_addr, &_res._u._ext.nsaddrs[i]->sin6_addr, sizeof(IN6_ADDR) ); - s->sin6_scope_id = _res._u._ext.nsaddrs[i]->sin6_scope_id; - memset( (char *)s + sizeof(SOCKADDR_IN6), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + sockaddr_in6_to_WS_storage( addr, _res._u._ext.nsaddrs[i] ); } else #endif { - *(struct sockaddr_in *)addr = _res.nsaddr_list[i]; - memset( (char *)addr + sizeof(struct sockaddr_in), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + sockaddr_in_to_WS_storage( addr, _res.nsaddr_list + i ); } addr++; } @@ -1004,21 +1019,11 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) if (buf[i].ss_family == AF_INET6) { - SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; - struct sockaddr_in6 *ptr = (struct sockaddr_in6 *)(buf + i); - s->sin6_family = WS_AF_INET6; - s->sin6_port = ptr->sin6_port; - s->sin6_flowinfo = ptr->sin6_flowinfo; - memcpy( &s->sin6_addr, &ptr->sin6_addr, sizeof(IN6_ADDR) ); - s->sin6_scope_id = ptr->sin6_scope_id; - memset( (char *)s + sizeof(SOCKADDR_IN6), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + sockaddr_in6_to_WS_storage( addr, (struct sockaddr_in6 *)(buf + i) ); } else { - *(struct sockaddr_in *)addr = *(struct sockaddr_in *)(buf + i); - memset( (char *)addr + sizeof(struct sockaddr_in), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + sockaddr_in_to_WS_storage( addr, (struct sockaddr_in *)(buf + i) ); } if (++addr >= servers + num) break; }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013