September 2018 - Wine-Devel

Re: [PATCH vkd3d 2/8] vkd3d-shader: Implement texel offsets for ld instructions.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 13, 2018

Re: [PATCH vkd3d 1/8] vkd3d-shader: Add support for more interpolation modifiers.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 13, 2018

[PATCH] wintab32: Correct ordinal in comment to the same as in the spec file.

by Bernhard Übelacker

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/wintab32/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 6f8f69ce96..d9cfe85168 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -471,7 +471,7 @@ UINT WINAPI WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) } /*********************************************************************** - * WTOpenW (WINTAB32.2021) + * WTOpenW (WINTAB32.1021) */ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { @@ -767,7 +767,7 @@ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) } /*********************************************************************** - * WTConfig (WINTAB32.61) + * WTConfig (WINTAB32.60) */ BOOL WINAPI WTConfig(HCTX hCtx, HWND hWnd) { -- 2.18.0

Sept. 13, 2018

Re: [PATCH 1/8] wsdapi: Use slim reader/writer lock instead of critical section.

by Zebediah Figura

On 13/09/18 03:44, Owen Rudge wrote: > Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> > --- > dlls/wsdapi/discovery.c | 13 ++++++------- > dlls/wsdapi/network.c | 4 ++-- > dlls/wsdapi/wsdapi_internal.h | 2 +- > 3 files changed, 9 insertions(+), 10 deletions(-) > > > > > I haven't looked at the rest of the series, but is this functionally necessary? Given that SRW locks will provide worse performance on Wine than critical sections. Although I think SRW locks can be made to use futexes internally too...

Sept. 13, 2018

Re: [PATCH v3 3/3] comdlg32/tests: Fix failures on newer Windows 10.

by Zhiyi Zhang

No sure why this happened. I think it not related to the changes. Please see same patch set successful runs: https://testbot.winehq.org/JobDetails.pl?Key=41987 https://testbot.winehq.org/JobDetails.pl?Key=41982 On 09/13/2018 06:07 PM, Marvin wrote: > Hi, > > While running your changed tests on Windows, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=41986 > > Your paranoid android. > > > === w7pro64 (32 bit Windows report) === > > comdlg32: > 0ad4:itemdlg: unhandled exception c0000005 at 75371EA3

Sept. 13, 2018

Re: [PATCH 1/8] wsdapi: Use slim reader/writer lock instead of critical section.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Sept. 13, 2018

Re: [PATCH v5 3/7] shell32/autocomplete: Redesign the window proc to trigger on key presses instead of key release

by Huw Davies

On Wed, Sep 12, 2018 at 10:42:17PM +0300, Gabriel Ivăncescu wrote: > AutoComplete currently shows up when the user releases a key, which is > wrong. Windows does it when the user presses a key, so use both WM_KEYDOWN > and WM_CHAR and redesign it so that it matches Windows behavior. > > Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> > --- > > Compared to version 4 of the patch, noautoappend and displayall have been > collapsed into one parameter to reduce clutter when calling the function, > since the latter implies the former (uses value 2 since it's only used in > one place at the beginning of the function); to me it's better than seeing > stuff like TRUE, FALSE or TRUE, TRUE (of course can be changed to that, > if needed... just a preference here) Not that it really matters, because this isn't going to go in as it is, but having noautoappend as a tri-state is fine, except you can't declare it as a BOOL and use FALSE, TRUE and 2 as its states. You'd want an enum. Huw. > > dlls/shell32/autocomplete.c | 108 ++++++++++++++++++++++++-------------------- > 1 file changed, 59 insertions(+), 49 deletions(-) > > diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c > index 63fdf3d..71259af 100644 > --- a/dlls/shell32/autocomplete.c > +++ b/dlls/shell32/autocomplete.c > @@ -119,10 +119,25 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st > return dst - base; > } > > -static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND hwnd, BOOL displayall) > +static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, BOOL noautoappend) > { > HRESULT hr; > - UINT cpt; > + WCHAR *text; > + UINT cpt, size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); > + > + if (noautoappend != 2 && len == 0) > + { > + if (ac->options & ACO_AUTOSUGGEST) > + ShowWindow(ac->hwndListBox, SW_HIDE); > + return; > + } > + > + size = len + 1; > + if (!(text = heap_alloc(size * sizeof(WCHAR)))) > + return; > + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); > + if (len + 1 != size) > + text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); > > SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); > > @@ -130,9 +145,6 @@ static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND > heap_free(ac->txtbackup); > ac->txtbackup = text; > > - if (!displayall && !len) > - return; > - > IEnumString_Reset(ac->enumstr); > for(cpt = 0;;) > { > @@ -145,7 +157,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND > > if (!strncmpiW(text, strs, len)) > { > - if (cpt == 0 && (ac->options & ACO_AUTOAPPEND)) > + if (cpt == 0 && noautoappend == FALSE) > { > WCHAR buffW[255]; > > @@ -203,9 +215,7 @@ static void destroy_autocomplete_object(IAutoCompleteImpl *ac) > static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) > { > IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); > - WCHAR *hwndText; > - UINT len, size; > - BOOL displayall = FALSE; > + LRESULT ret; > > if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > > @@ -221,20 +231,20 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, > ShowWindow(This->hwndListBox, SW_HIDE); > } > return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > - case WM_KEYUP: > - len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); > - size = len + 1; > - if (!(hwndText = heap_alloc(size * sizeof(WCHAR)))) > - return 0; > - len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)hwndText); > - > + case WM_KEYDOWN: > switch(wParam) { > case VK_RETURN: > /* If quickComplete is set and control is pressed, replace the string */ > if (This->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000)) > { > - WCHAR *buf; > - size_t sz = strlenW(This->quickComplete) + 1 + len; > + WCHAR *hwndText, *buf; > + size_t sz; > + UINT len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); > + if (!(hwndText = heap_alloc((len + 1) * sizeof(WCHAR)))) > + return 0; > + len = SendMessageW(hwnd, WM_GETTEXT, len + 1, (LPARAM)hwndText); > + sz = strlenW(This->quickComplete) + 1 + len; > + > if ((buf = heap_alloc(sz * sizeof(WCHAR)))) > { > len = format_quick_complete(buf, This->quickComplete, hwndText, len); > @@ -242,32 +252,35 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, > SendMessageW(hwnd, EM_SETSEL, 0, len); > heap_free(buf); > } > + > + if (This->options & ACO_AUTOSUGGEST) > + ShowWindow(This->hwndListBox, SW_HIDE); > + heap_free(hwndText); > + return 0; > } > > if (This->options & ACO_AUTOSUGGEST) > ShowWindow(This->hwndListBox, SW_HIDE); > - heap_free(hwndText); > - return 0; > - case VK_LEFT: > - case VK_RIGHT: > - heap_free(hwndText); > - return 0; > + break; > case VK_UP: > case VK_DOWN: > - /* Two cases here : > - - if the listbox is not visible, displays it > - with all the entries if the style ACO_UPDOWNKEYDROPSLIST > - is present but does not select anything. > + /* Two cases here: > + - if the listbox is not visible and ACO_UPDOWNKEYDROPSLIST is > + set, display it with all the entries, without selecting any > - if the listbox is visible, change the selection > */ > - if ( (This->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) > - && (!IsWindowVisible(This->hwndListBox) && (! *hwndText)) ) > + if (This->options & ACO_AUTOSUGGEST) > { > - /* We must display all the entries */ > - displayall = TRUE; > - } else { > - heap_free(hwndText); > - if (IsWindowVisible(This->hwndListBox)) { > + if (!IsWindowVisible(This->hwndListBox)) > + { > + if (This->options & ACO_UPDOWNKEYDROPSLIST) > + { > + autocomplete_text(This, hwnd, 2); > + return 0; > + } > + } > + else > + { > int count, sel; > > count = SendMessageW(This->hwndListBox, LB_GETCOUNT, 0, 0); > @@ -295,25 +308,22 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, > len = strlenW(This->txtbackup); > SendMessageW(hwnd, EM_SETSEL, len, len); > } > + return 0; > } > - return 0; > } > break; > - case VK_BACK: > case VK_DELETE: > - if ((! *hwndText) && (This->options & ACO_AUTOSUGGEST)) { > - heap_free(hwndText); > - ShowWindow(This->hwndListBox, SW_HIDE); > - return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > - } > - break; > + ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > + autocomplete_text(This, hwnd, TRUE); > + return ret; > } > - > - if (len + 1 != size) > - hwndText = heap_realloc(hwndText, (len + 1) * sizeof(WCHAR)); > - > - autocomplete_text(This, hwndText, len, hwnd, displayall); > - break; > + return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > + case WM_CHAR: > + case WM_UNICHAR: > + ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > + autocomplete_text(This, hwnd, (wParam < ' ' && wParam != 0x16 /* ^V (paste) */) > + || !(This->options & ACO_AUTOAPPEND)); > + return ret; > case WM_DESTROY: > { > WNDPROC proc = This->wpOrigEditProc; > -- > 1.9.1 > > >

Sept. 13, 2018

Re: [PATCH v5 2/7] shell32/autocomplete: Move the autocomplete processing to a separate function

by Huw Davies

On Wed, Sep 12, 2018 at 10:42:16PM +0300, Gabriel Ivăncescu wrote: > Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> > --- > dlls/shell32/autocomplete.c | 135 ++++++++++++++++++++++++-------------------- > 1 file changed, 73 insertions(+), 62 deletions(-) This wasn't exactly what I was expecting. What I'd hoped to see was the entire WM_KEYUP handler moved to a helper function, not half of it. [FWIW, renaming variable and re-formatting the code in the new helper is a good plan]. After you do that, I then suggest pulling the code that deals with the displayall stuff into a sub-helper---this is most of the code that you have in autocomplete_text(). Huw. > diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c > index 9f35ff7..63fdf3d 100644 > --- a/dlls/shell32/autocomplete.c > +++ b/dlls/shell32/autocomplete.c > @@ -119,6 +119,76 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st > return dst - base; > } > > +static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND hwnd, BOOL displayall) > +{ > + HRESULT hr; > + UINT cpt; > + > + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); > + > + /* Set txtbackup to point to text itself (which must not be released) */ > + heap_free(ac->txtbackup); > + ac->txtbackup = text; > + > + if (!displayall && !len) > + return; > + > + IEnumString_Reset(ac->enumstr); > + for(cpt = 0;;) > + { > + LPOLESTR strs = NULL; > + ULONG fetched; > + > + hr = IEnumString_Next(ac->enumstr, 1, &strs, &fetched); > + if (hr != S_OK) > + break; > + > + if (!strncmpiW(text, strs, len)) > + { > + if (cpt == 0 && (ac->options & ACO_AUTOAPPEND)) > + { > + WCHAR buffW[255]; > + > + strcpyW(buffW, text); > + strcatW(buffW, &strs[len]); > + SetWindowTextW(hwnd, buffW); > + SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); > + if (!(ac->options & ACO_AUTOSUGGEST)) > + { > + CoTaskMemFree(strs); > + break; > + } > + } > + > + if (ac->options & ACO_AUTOSUGGEST) > + SendMessageW(ac->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); > + > + cpt++; > + } > + > + CoTaskMemFree(strs); > + } > + > + if (ac->options & ACO_AUTOSUGGEST) > + { > + if (cpt) > + { > + RECT r; > + UINT height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); > + SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); > + GetWindowRect(hwnd, &r); > + SetParent(ac->hwndListBox, HWND_DESKTOP); > + /* It seems that Windows XP displays 7 lines at most > + and otherwise displays a vertical scroll bar */ > + SetWindowPos(ac->hwndListBox, HWND_TOP, > + r.left, r.bottom + 1, r.right - r.left, min(height * 7, height*(cpt+1)), > + SWP_SHOWWINDOW ); > + } > + else > + ShowWindow(ac->hwndListBox, SW_HIDE); > + } > +} > + > static void destroy_autocomplete_object(IAutoCompleteImpl *ac) > { > ac->hwndEdit = NULL; > @@ -133,12 +203,9 @@ static void destroy_autocomplete_object(IAutoCompleteImpl *ac) > static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) > { > IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); > - HRESULT hr; > WCHAR *hwndText; > - UINT len, size, cpt; > - RECT r; > + UINT len, size; > BOOL displayall = FALSE; > - int height, sel; > > if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); > > @@ -201,7 +268,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, > } else { > heap_free(hwndText); > if (IsWindowVisible(This->hwndListBox)) { > - int count; > + int count, sel; > > count = SendMessageW(This->hwndListBox, LB_GETCOUNT, 0, 0); > /* Change the selection */ > @@ -245,63 +312,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, > if (len + 1 != size) > hwndText = heap_realloc(hwndText, (len + 1) * sizeof(WCHAR)); > > - SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); > - > - /* Set txtbackup to point to hwndText itself (which must not be released) */ > - heap_free(This->txtbackup); > - This->txtbackup = hwndText; > - > - if (!displayall && !len) > - break; > - > - IEnumString_Reset(This->enumstr); > - for(cpt = 0;;) { > - LPOLESTR strs = NULL; > - ULONG fetched; > - > - hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); > - if (hr != S_OK) > - break; > - > - if (!strncmpiW(hwndText, strs, len)) { > - if (cpt == 0 && (This->options & ACO_AUTOAPPEND)) { > - WCHAR buffW[255]; > - > - strcpyW(buffW, hwndText); > - strcatW(buffW, &strs[len]); > - SetWindowTextW(hwnd, buffW); > - SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); > - if (!(This->options & ACO_AUTOSUGGEST)) { > - CoTaskMemFree(strs); > - break; > - } > - } > - > - if (This->options & ACO_AUTOSUGGEST) > - SendMessageW(This->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); > - > - cpt++; > - } > - > - CoTaskMemFree(strs); > - } > - > - if (This->options & ACO_AUTOSUGGEST) { > - if (cpt) { > - height = SendMessageW(This->hwndListBox, LB_GETITEMHEIGHT, 0, 0); > - SendMessageW(This->hwndListBox, LB_CARETOFF, 0, 0); > - GetWindowRect(hwnd, &r); > - SetParent(This->hwndListBox, HWND_DESKTOP); > - /* It seems that Windows XP displays 7 lines at most > - and otherwise displays a vertical scroll bar */ > - SetWindowPos(This->hwndListBox, HWND_TOP, > - r.left, r.bottom + 1, r.right - r.left, min(height * 7, height*(cpt+1)), > - SWP_SHOWWINDOW ); > - } else { > - ShowWindow(This->hwndListBox, SW_HIDE); > - } > - } > - > + autocomplete_text(This, hwndText, len, hwnd, displayall); > break; > case WM_DESTROY: > { > -- > 1.9.1 > > >

Sept. 13, 2018

Re: [PATCH v5 1/7] shell32/autocomplete: Dynamically allocate hwndText so it can handle arbitrary sizes

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Sept. 13, 2018

Re: [PATCH 2/8] wsdapi/tests: Add test for duplicate message filtering.

by Huw Davies

On Thu, Sep 13, 2018 at 11:05:06AM +0100, Huw Davies wrote: > On Thu, Sep 13, 2018 at 09:44:34AM +0100, Owen Rudge wrote: > > + Sleep(1000); > > Can't we poll for this? The tests are starting to take quite a long > time to complete, and this doesn't help. Besides which it's a race. Huw.

Sept. 13, 2018