October 2018 - Wine-Commits

Piotr Caban : ole32/tests: Add StdMarshal custom marshaling test.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 3c2764cc9582370c563e88d128527467829e243d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2764cc9582370c563e88d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:12:03 2018 +0200 ole32/tests: Add StdMarshal custom marshaling test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 158 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 39d9a55..45ddc40 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1352,6 +1352,162 @@ todo_wine end_host_object(tid, thread); } +DEFINE_EXPECT(CustomMarshal_GetUnmarshalClass); +DEFINE_EXPECT(CustomMarshal_GetMarshalSizeMax); +DEFINE_EXPECT(CustomMarshal_MarshalInterface); + +static HRESULT WINAPI CustomMarshal_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMarshal)) { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI CustomMarshal_AddRef(IMarshal *iface) +{ + return 2; +} + +static ULONG WINAPI CustomMarshal_Release(IMarshal *iface) +{ + return 1; +} + +static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); + *clsid = CLSID_StdMarshal; + return S_OK; +} + +static HRESULT WINAPI CustomMarshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + CHECK_EXPECT(CustomMarshal_GetMarshalSizeMax); + ok(size != NULL, "size = NULL\n"); + + *size = 0; + return S_OK; +} + +static HRESULT WINAPI CustomMarshal_MarshalInterface(IMarshal *iface, IStream *stream, + REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) +{ + IMarshal *std_marshal; + STATSTG stat; + HRESULT hr; + + CHECK_EXPECT(CustomMarshal_MarshalInterface); + + hr = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); + ok_ole_success(hr, IStream_Stat); + ok(U(stat.cbSize).LowPart == 0, "stream is not empty (%d)\n", U(stat.cbSize).LowPart); + ok(U(stat.cbSize).HighPart == 0, "stream is not empty (%d)\n", U(stat.cbSize).HighPart); + + hr = CoGetStandardMarshal(riid, (IUnknown*)iface, + dwDestContext, NULL, mshlflags, &std_marshal); + ok_ole_success(hr, CoGetStandardMarshal); + hr = IMarshal_MarshalInterface(std_marshal, stream, riid, pv, + dwDestContext, pvDestContext, mshlflags); + ok_ole_success(hr, IMarshal_MarshalInterface); + IMarshal_Release(std_marshal); + + return S_OK; +} + +static HRESULT WINAPI CustomMarshal_UnmarshalInterface(IMarshal *iface, + IStream *stream, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomMarshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomMarshal_DisconnectObject(IMarshal *iface, DWORD res) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IMarshalVtbl CustomMarshalVtbl = +{ + CustomMarshal_QueryInterface, + CustomMarshal_AddRef, + CustomMarshal_Release, + CustomMarshal_GetUnmarshalClass, + CustomMarshal_GetMarshalSizeMax, + CustomMarshal_MarshalInterface, + CustomMarshal_UnmarshalInterface, + CustomMarshal_ReleaseMarshalData, + CustomMarshal_DisconnectObject +}; + +static IMarshal CustomMarshal = { &CustomMarshalVtbl }; + +static void test_StdMarshal_custom_marshaling(void) +{ + IStream *stream; + IUnknown *unk; + DWORD size; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + SET_EXPECT(CustomMarshal_GetUnmarshalClass); + SET_EXPECT(CustomMarshal_MarshalInterface); + hr = CoMarshalInterface(stream, &IID_IUnknown, (IUnknown*)&CustomMarshal, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + CHECK_CALLED(CustomMarshal_GetUnmarshalClass); + CHECK_CALLED(CustomMarshal_MarshalInterface); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); + hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void**)&unk); + ok_ole_success(hr, CoUnmarshalInterface); + ok(unk == (IUnknown*)&CustomMarshal, "unk != &CustomMarshal\n"); + IUnknown_Release(unk); + IStream_Release(stream); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + SET_EXPECT(CustomMarshal_GetUnmarshalClass); + SET_EXPECT(CustomMarshal_MarshalInterface); + hr = CoMarshalInterface(stream, &IID_IUnknown, (IUnknown*)&CustomMarshal, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + CHECK_CALLED(CustomMarshal_GetUnmarshalClass); + CHECK_CALLED(CustomMarshal_MarshalInterface); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); + hr = CoReleaseMarshalData(stream); + ok_ole_success(hr, CoReleaseMarshalData); + IStream_Release(stream); + + SET_EXPECT(CustomMarshal_GetMarshalSizeMax); + hr = CoGetMarshalSizeMax(&size, &IID_IUnknown, (IUnknown*)&CustomMarshal, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoGetMarshalSizeMax); + CHECK_CALLED(CustomMarshal_GetMarshalSizeMax); + ok(size == sizeof(OBJREF), "size = %d, expected %d\n", size, (int)sizeof(OBJREF)); +} + static void test_CoGetStandardMarshal(void) { DUALSTRINGARRAY *dualstringarr; @@ -1429,7 +1585,6 @@ static void test_CoGetStandardMarshal(void) IMarshal_Release(marshal); } - struct ncu_params { LPSTREAM stream; @@ -4439,6 +4594,7 @@ START_TEST(marshal) } while (with_external_conn); test_marshal_channel_buffer(); + test_StdMarshal_custom_marshaling(); test_CoGetStandardMarshal(); test_hresult_marshaling(); test_proxy_used_in_wrong_thread();

1 0

Piotr Caban : ole32: Don' t pass incorrect iface pointer to StdMarshalImpl functions.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 6cc09e34249b1d3fab676fb6ea41e5b8b35c5400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc09e34249b1d3fab676fb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:25 2018 +0200 ole32: Don't pass incorrect iface pointer to StdMarshalImpl functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 88 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 6bfd47e..43b9af7 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -362,12 +362,7 @@ static const IMultiQIVtbl ClientIdentity_Vtbl = ClientIdentity_QueryMultipleInterfaces }; -/* FIXME: remove these */ -static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass(LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid); -static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax(LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, DWORD* pSize); -static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv); -static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm); -static HRESULT WINAPI StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved); +static HRESULT StdMarshalImpl_Construct(REFIID, DWORD, void*, void**); static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject) { @@ -387,6 +382,22 @@ static ULONG WINAPI Proxy_Release(IMarshal *iface) return IMultiQI_Release(&This->IMultiQI_iface); } +static HRESULT WINAPI Proxy_GetUnmarshalClass( + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags, CLSID* pCid) +{ + *pCid = CLSID_DfMarshal; + return S_OK; +} + +static HRESULT WINAPI Proxy_GetMarshalSizeMax( + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags, DWORD* pSize) +{ + *pSize = sizeof(STDOBJREF); + return S_OK; +} + static HRESULT WINAPI Proxy_MarshalInterface( LPMARSHAL iface, IStream *pStm, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags) @@ -501,17 +512,72 @@ static HRESULT WINAPI Proxy_MarshalInterface( return hr; } +static HRESULT WINAPI Proxy_UnmarshalInterface( + IMarshal *iface, IStream *pStm, REFIID riid, void **ppv) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + IMarshal *marshal; + HRESULT hr; + + TRACE("(%p, %p, %s, %p)\n", This, pStm, wine_dbgstr_guid(riid), ppv); + + hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, + This->dest_context_data, (void**)&marshal); + if(FAILED(hr)) + return hr; + + hr = IMarshal_UnmarshalInterface(marshal, pStm, riid, ppv); + IMarshal_Release(marshal); + return hr; +} + +static HRESULT WINAPI Proxy_ReleaseMarshalData(IMarshal *iface, IStream *pStm) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + IMarshal *marshal; + HRESULT hr; + + TRACE("(%p, %p)\n", This, pStm); + + hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, + This->dest_context_data, (void**)&marshal); + if(FAILED(hr)) + return hr; + + hr = IMarshal_ReleaseMarshalData(marshal, pStm); + IMarshal_Release(marshal); + return hr; +} + +static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + IMarshal *marshal; + HRESULT hr; + + TRACE("(%p, %x)\n", This, dwReserved); + + hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, + This->dest_context_data, (void**)&marshal); + if(FAILED(hr)) + return hr; + + hr = IMarshal_DisconnectObject(marshal, dwReserved); + IMarshal_Release(marshal); + return hr; +} + static const IMarshalVtbl ProxyMarshal_Vtbl = { Proxy_QueryInterface, Proxy_AddRef, Proxy_Release, - StdMarshalImpl_GetUnmarshalClass, - StdMarshalImpl_GetMarshalSizeMax, + Proxy_GetUnmarshalClass, + Proxy_GetMarshalSizeMax, Proxy_MarshalInterface, - StdMarshalImpl_UnmarshalInterface, - StdMarshalImpl_ReleaseMarshalData, - StdMarshalImpl_DisconnectObject + Proxy_UnmarshalInterface, + Proxy_ReleaseMarshalData, + Proxy_DisconnectObject }; static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject)

1 0

Gabriel Ivăncescu : shell32/autocomplete: Hide the AutoComplete listbox when auto-suggest is turned off.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 51c5fb78170d2896fb6817ab399ebc6a2b5f9d32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c5fb78170d2896fb6817ab… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 28 14:44:09 2018 +0300 shell32/autocomplete: Hide the AutoComplete listbox when auto-suggest is turned off. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b229fed..5a8e03a 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -775,6 +775,8 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( if ((This->options & ACO_AUTOSUGGEST) && This->hwndEdit && !This->hwndListBox) create_listbox(This); + else if (!(This->options & ACO_AUTOSUGGEST) && This->hwndListBox) + hide_listbox(This, This->hwndListBox); return hr; }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Hide the auto-suggest listbox when ESC is pressed.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 5d5e84a0d803a3657aac4cffd5b7598347468a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5e84a0d803a3657aac4cff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 28 14:44:07 2018 +0300 shell32/autocomplete: Hide the auto-suggest listbox when ESC is pressed. When the listbox is visible, ESC should hide it. Only when it's not visible should it be forwarded to the edit control. This matches Windows behavior. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5a2ebb7..3646e40 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -346,6 +346,15 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT { switch (wParam) { + case VK_ESCAPE: + /* When pressing ESC, Windows hides the auto-suggest listbox, if visible */ + if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBox)) + { + ShowWindow(ac->hwndListBox, SW_HIDE); + ac->no_fwd_char = 0x1B; /* ESC char */ + return 0; + } + break; case VK_RETURN: /* If quickComplete is set and control is pressed, replace the string */ if (ac->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000))

1 0

Gabriel Ivăncescu : shell32/autocomplete: Implement ACO_USETAB option.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: d3830fbd87dfbfbcb77ace605de3a2b6d2773376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3830fbd87dfbfbcb77ace60… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 28 14:44:10 2018 +0300 shell32/autocomplete: Implement ACO_USETAB option. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5a8e03a..11e9317 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -19,17 +19,9 @@ */ /* - Implemented: - - ACO_AUTOAPPEND style - - ACO_AUTOSUGGEST style - - ACO_UPDOWNKEYDROPSLIST style - - - Handle pwzsRegKeyPath and pwszQuickComplete in Init - TODO: - implement ACO_SEARCH style - implement ACO_FILTERPREFIXES style - - implement ACO_USETAB style - implement ACO_RTLREADING style - implement ResetEnumerator - string compares should be case-insensitive, the content of the list should be sorted @@ -205,7 +197,7 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) } } } - else if (key == VK_UP) + else if (key == VK_UP || (key == VK_TAB && (GetKeyState(VK_SHIFT) & 0x8000))) sel = ((sel - 1) < -1) ? count - 1 : sel - 1; else sel = ((sel + 1) >= count) ? -1 : sel + 1; @@ -391,6 +383,14 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT if (select_item_with_return_key(ac, hwnd)) return 0; break; + case VK_TAB: + if ((ac->options & (ACO_AUTOSUGGEST | ACO_USETAB)) == (ACO_AUTOSUGGEST | ACO_USETAB) + && IsWindowVisible(ac->hwndListBox) && !(GetKeyState(VK_CONTROL) & 0x8000)) + { + ac->no_fwd_char = '\t'; + return change_selection(ac, hwnd, wParam); + } + break; case VK_UP: case VK_DOWN: case VK_PRIOR: @@ -646,7 +646,6 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n"); if (This->options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n"); - if (This->options & ACO_USETAB) FIXME(" ACO_USETAB not supported\n"); if (This->options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); if (!hwndEdit || !punkACL)

1 0

Gabriel Ivăncescu : shell32/autocomplete: Fix handling of Return key when an auto-suggestion item is selected.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: b3945207db8b433163bcc0360cfa66a512469d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3945207db8b433163bcc036… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 28 14:44:06 2018 +0300 shell32/autocomplete: Fix handling of Return key when an auto-suggestion item is selected. When selecting an item from the AutoComplete's listbox, the Return key should act the same as a left click on it (place the text, select it, and hide the listbox). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5cf63fe..5a2ebb7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -77,6 +77,7 @@ typedef struct WCHAR *quickComplete; IEnumString *enumstr; AUTOCOMPLETEOPTIONS options; + WCHAR no_fwd_char; } IAutoCompleteImpl; enum autoappend_flag @@ -134,6 +135,34 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st return dst - base; } +static BOOL select_item_with_return_key(IAutoCompleteImpl *ac, HWND hwnd) +{ + WCHAR *text; + HWND hwndListBox = ac->hwndListBox; + if (!(ac->options & ACO_AUTOSUGGEST)) + return FALSE; + + if (IsWindowVisible(hwndListBox)) + { + INT sel = SendMessageW(hwndListBox, LB_GETCURSEL, 0, 0); + if (sel >= 0) + { + UINT len = SendMessageW(hwndListBox, LB_GETTEXTLEN, sel, 0); + if ((text = heap_alloc((len + 1) * sizeof(WCHAR)))) + { + len = SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)text); + set_text_and_selection(ac, hwnd, text, 0, len); + ShowWindow(hwndListBox, SW_HIDE); + ac->no_fwd_char = '\r'; /* RETURN char */ + heap_free(text); + return TRUE; + } + } + } + ShowWindow(hwndListBox, SW_HIDE); + return FALSE; +} + static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) { INT count = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); @@ -324,6 +353,8 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT WCHAR *text, *buf; size_t sz; UINT len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + ac->no_fwd_char = '\n'; /* CTRL+RETURN char */ + if (!(text = heap_alloc((len + 1) * sizeof(WCHAR)))) return 0; len = SendMessageW(hwnd, WM_GETTEXT, len + 1, (LPARAM)text); @@ -342,8 +373,8 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT return 0; } - if (ac->options & ACO_AUTOSUGGEST) - ShowWindow(ac->hwndListBox, SW_HIDE); + if (select_item_with_return_key(ac, hwnd)) + return 0; break; case VK_UP: case VK_DOWN: @@ -375,6 +406,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT return ret; } } + ac->no_fwd_char = '\0'; return CallWindowProcW(ac->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } @@ -404,6 +436,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR: case WM_UNICHAR: + if (wParam == This->no_fwd_char) return 0; + This->no_fwd_char = '\0'; + /* Don't autocomplete at all on most control characters */ if (iscntrlW(wParam) && !(wParam >= '\b' && wParam <= '\r')) break;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Reset the contents of the AutoComplete listbox when hiding it.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 5aa7dbf4d855d6c1d4f082e990a2af585d44b3ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa7dbf4d855d6c1d4f082e9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 28 14:44:08 2018 +0300 shell32/autocomplete: Reset the contents of the AutoComplete listbox when hiding it. There's no point to have it lingering around, since it's always recreated before being shown again. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 3646e40..b229fed 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -109,6 +109,12 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } +static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd) +{ + ShowWindow(hwnd, SW_HIDE); + SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); +} + static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) { /* Replace the first %s directly without using snprintf, to avoid @@ -152,14 +158,14 @@ static BOOL select_item_with_return_key(IAutoCompleteImpl *ac, HWND hwnd) { len = SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)text); set_text_and_selection(ac, hwnd, text, 0, len); - ShowWindow(hwndListBox, SW_HIDE); + hide_listbox(ac, hwndListBox); ac->no_fwd_char = '\r'; /* RETURN char */ heap_free(text); return TRUE; } } } - ShowWindow(hwndListBox, SW_HIDE); + hide_listbox(ac, hwndListBox); return FALSE; } @@ -259,7 +265,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (flag != autoappend_flag_displayempty && len == 0) { if (ac->options & ACO_AUTOSUGGEST) - ShowWindow(ac->hwndListBox, SW_HIDE); + hide_listbox(ac, ac->hwndListBox); return; } @@ -326,7 +332,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else - ShowWindow(ac->hwndListBox, SW_HIDE); + hide_listbox(ac, ac->hwndListBox); } } @@ -350,7 +356,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT /* When pressing ESC, Windows hides the auto-suggest listbox, if visible */ if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBox)) { - ShowWindow(ac->hwndListBox, SW_HIDE); + hide_listbox(ac, ac->hwndListBox); ac->no_fwd_char = 0x1B; /* ESC char */ return 0; } @@ -377,7 +383,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT } if (ac->options & ACO_AUTOSUGGEST) - ShowWindow(ac->hwndListBox, SW_HIDE); + hide_listbox(ac, ac->hwndListBox); heap_free(text); return 0; } @@ -433,12 +439,12 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { case CB_SHOWDROPDOWN: if (This->options & ACO_AUTOSUGGEST) - ShowWindow(This->hwndListBox, SW_HIDE); + hide_listbox(This, This->hwndListBox); return 0; case WM_KILLFOCUS: if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) { - ShowWindow(This->hwndListBox, SW_HIDE); + hide_listbox(This, This->hwndListBox); } break; case WM_KEYDOWN: @@ -504,7 +510,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); - ShowWindow(hwnd, SW_HIDE); + hide_listbox(This, hwnd); heap_free(msg); break; default:

1 0

Alexandre Julliard : Wine release 3.18
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: website Branch: master Commit: 3b293e5061be8e7a8053aa2e82c2062cc39442ce URL: https://source.winehq.org/git/website.git/?a=commit;h=3b293e5061be8e7a8053a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 13 01:00:57 2018 +0200 Wine release 3.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018101301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018101301.xml b/news/en/2018101301.xml new file mode 100644 index 0000000..0047360 --- /dev/null +++ b/news/en/2018101301.xml @@ -0,0 +1,16 @@ +<news> +<date>October 13, 2018</date> +<title>Wine 3.18 Released</title> +<body> + The Wine development release 3.18 is now available. + <a href="{$root}/announce/3.18">What's new</a> in this release: +<ul> + <li>Subpixel font rendering with FreeType >= 2.8.1.</li> + <li>Support for OAEP algorithm in RSA encryption.</li> + <li>Array marshalling fixes in DCOM.</li> + <li>Improved DPI scaling in the Wine console.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Matteo Bruni : wined3d: Add fallback to EXT_polygon_offset_clamp.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: b34a21740f4bc8d7d7d27ad462a4de7fc078cfcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34a21740f4bc8d7d7d27ad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 12 15:39:56 2018 +0200 wined3d: Add fallback to EXT_polygon_offset_clamp. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 16a26b8..cedfe23 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, {"GL_EXT_packed_float", EXT_PACKED_FLOAT }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS }, + {"GL_EXT_polygon_offset_clamp", ARB_POLYGON_OFFSET_CLAMP }, {"GL_EXT_provoking_vertex", EXT_PROVOKING_VERTEX }, {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR }, {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE }, @@ -2481,6 +2482,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) + /* GL_EXT_polgyon_offset_clamp */ + USE_GL_FUNC(glPolygonOffsetClampEXT) /* GL_EXT_provoking_vertex */ USE_GL_FUNC(glProvokingVertexEXT) /* GL_EXT_secondary_color */ @@ -2774,6 +2777,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION(glMinSampleShading, glMinSampleShadingARB); + MAP_GL_FUNCTION(glPolygonOffsetClamp, glPolygonOffsetClampEXT); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT);

1 0

Hans Leidekker : msi: Fix the remote case for MsiViewModify( MSIMODIFY_UPDATE).
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: c494570d89f270c9240519c625c5c757a4e8ff23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c494570d89f270c9240519c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 16:44:03 2018 +0200 msi: Fix the remote case for MsiViewModify(MSIMODIFY_UPDATE). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45972 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 ++-- dlls/msi/record.c | 11 ++++++----- dlls/msi/winemsi.idl | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 76f532f..4e61fdb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -141,8 +141,8 @@ typedef struct tagMSIFIELD typedef struct tagMSIRECORD { MSIOBJECTHDR hdr; - MSIQUERY *query; UINT count; /* as passed to MsiCreateRecord */ + UINT64 cookie; MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 544bfc9..701a347 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -379,7 +379,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - (*prec)->query = query; + (*prec)->cookie = (UINT64)(ULONG_PTR)query; MSI_RecordSetInteger(*prec, 0, 1); } @@ -693,7 +693,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && rec->query != query ) + if ( mode == MSIMODIFY_UPDATE && rec->cookie != (UINT64)(ULONG_PTR)query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index a7d5588..cca6308 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1064,6 +1064,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE; + rec->cookie = in->cookie; for (i = 0; i <= in->count; i++) { switch (in->fields[i].type) @@ -1114,17 +1115,17 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) struct wire_record *marshal_record(MSIHANDLE handle) { struct wire_record *ret; - unsigned int i, count; + unsigned int i; MSIRECORD *rec; if (!(rec = msihandle2msiinfo(handle, MSIHANDLETYPE_RECORD))) return NULL; - count = MSI_RecordGetFieldCount(rec); - ret = midl_user_allocate(sizeof(*ret) + count * sizeof(ret->fields[0])); - ret->count = count; + ret = midl_user_allocate(sizeof(*ret) + rec->count * sizeof(ret->fields[0])); + ret->count = rec->count; + ret->cookie = rec->cookie; - for (i = 0; i <= count; i++) + for (i = 0; i <= rec->count; i++) { switch (rec->fields[i].type) { diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index ebbca82..1658603 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -51,8 +51,10 @@ struct wire_field { int len; }; +/* compatible with MSIRECORD minus header */ struct wire_record { unsigned int count; + UINT64 cookie; [size_is(count+1)] struct wire_field fields[]; };

1 0