November 2018 - Wine-Devel - list.winehq.org

[PATCH v6 resend 2/2] hidclass.sys: use IoRegisterDeviceInterface

by Aric Stewart

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)

Nov. 2, 2018

[PATCH v6 resend 1/2] ntoskrnl.exe: Implement IoRegisterDeviceInterface

by Aric Stewart

v 6: More comments from Zebediah Figura and Dmitry Timoshkov Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 133 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 136 insertions(+), 2 deletions(-)

Nov. 2, 2018

Re: [PATCH v5 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior

by Huw Davies

On Fri, Nov 02, 2018 at 03:28:00PM +0200, Gabriel Ivăncescu wrote: > On Fri, Nov 2, 2018 at 1:45 PM Huw Davies <huw(a)codeweavers.com> wrote: > > > > Missed this before, but this is an unnecessary change. > > Let's also have a blank line between variable declarations and code. > > > Ok. > > > > > I mentioned the variable names in this function last time. 'i' and > > 'k' would be ok for loops, but here they're not used in that way; > > 'start' and 'end' would be much better choices. And like I said, then > > you really don't need 'cnt' at all. > > > But then I'd still need an 'i' to iterate through when inserting the > strings, if I don't use cnt (since it's needed for show_listbox > below). I won't be able to do end - start there if I change start... > > So net effect isn't really better compared to cnt (same amount of > variables; instead of cnt, start, end we'll need i, start, end), > though renaming the vars sounds like a good idea. Right, sorry, I missed that you use cnt in show_listbox(). So yeah, rename i -> start, k -> end, then either use cnt and increment start in the loop, or use a i in the loop without cnt. I don't mind either way. Huw.

Nov. 2, 2018

Re: [PATCH v5 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior

by Gabriel Ivăncescu

On Fri, Nov 2, 2018 at 1:45 PM Huw Davies <huw(a)codeweavers.com> wrote: > > Missed this before, but this is an unnecessary change. > Let's also have a blank line between variable declarations and code. > Ok. > > I mentioned the variable names in this function last time. 'i' and > 'k' would be ok for loops, but here they're not used in that way; > 'start' and 'end' would be much better choices. And like I said, then > you really don't need 'cnt' at all. > But then I'd still need an 'i' to iterate through when inserting the strings, if I don't use cnt (since it's needed for show_listbox below). I won't be able to do end - start there if I change start... So net effect isn't really better compared to cnt (same amount of variables; instead of cnt, start, end we'll need i, start, end), though renaming the vars sounds like a good idea.

Nov. 2, 2018

Re: [PATCH 2/2] rpcrt4: Avoid reference leaks when unmarshalling [in, out] pointers. (resend)

by Huw Davies

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

Nov. 2, 2018

Re: [PATCH 1/2] widl: Correctly handle conformant arrays in clear_output_vars().

by Huw Davies

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

Nov. 2, 2018

Re: [PATCH v5 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior

by Huw Davies

On Thu, Nov 01, 2018 at 09:41:53PM +0200, Gabriel Ivăncescu wrote: > Windows doesn't reset and re-enumerate it everytime autocompletion happens, > and it also sorts the strings. This matches it more closely and makes it > more useable on large lists as well. > > Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> > --- > dlls/shell32/autocomplete.c | 209 +++++++++++++++++++++++++++++++------------- > 1 file changed, 148 insertions(+), 61 deletions(-) > > diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c > index b3f86f3..d557a4a 100644 > --- a/dlls/shell32/autocomplete.c > +++ b/dlls/shell32/autocomplete.c > @@ -240,7 +325,11 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) > > static BOOL do_aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt, WCHAR *last_delim) > { > - WCHAR c = last_delim[1]; > + WCHAR c; Missed this before, but this is an unnecessary change. Let's also have a blank line between variable declarations and code. > + free_enum_strs(ac); > + IEnumString_Reset(ac->enumstr); /* call before expand */ > + > + c = last_delim[1]; > last_delim[1] = '\0'; > IACList_Expand(ac->aclist, txt); > last_delim[1] = c; > @@ -276,6 +365,9 @@ static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) > while (i--) > if (strchrW(delims, txt[i])) > return do_aclist_expand(ac, txt, &txt[i]); > + > + /* Windows doesn't expand without a delim, but it does reset */ > + free_enum_strs(ac); > } > > return FALSE; > @@ -312,66 +404,58 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, > HWND hwnd, enum autoappend_flag flag) > { > /* Return FALSE if we need to hide the listbox */ > - UINT cpt; > + WCHAR **str = ac->enum_strs; > + UINT cnt, i, k; > + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; > > - if (ac->options & ACO_AUTOSUGGEST) > + if (len) > { > - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); > - SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); > + i = find_matching_enum_str(ac, 0, text, len, -1); > + if (i == ~0) > + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; > + > + if (flag == autoappend_flag_yes) > + autoappend_str(ac, text, len, str[i], hwnd); > + if (!(ac->options & ACO_AUTOSUGGEST)) > + return TRUE; > + > + /* Find the index beyond the last string that matches */ > + k = find_matching_enum_str(ac, i + 1, text, len, 1); > + k = (k == ~0 ? i : k) + 1; > } > - for (cpt = 0;;) > - { > - HRESULT hr; > - 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 && flag == autoappend_flag_yes) > - { > - autoappend_str(ac, text, len, strs, hwnd); > - 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) > + else > { > - if (cpt) > - { > - show_listbox(ac, cpt); > - SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); > - } > - else > + if (!(ac->options & ACO_AUTOSUGGEST)) > + return TRUE; > + i = 0; > + k = ac->enum_strs_num; > + if (k == 0) > return FALSE; > } > + cnt = k - i; I mentioned the variable names in this function last time. 'i' and 'k' would be ok for loops, but here they're not used in that way; 'start' and 'end' would be much better choices. And like I said, then you really don't need 'cnt' at all. > + > + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); > + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); > + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); > + do > + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[i]); > + while (++i < k); It's minor, but I would probably write this loop as a for loop with an empty initialization statement. Huw.

Nov. 2, 2018

[PATCH] wshom: Split the command line before passing it to ShellExecuteEx.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 34 ++++++++++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1aa353a17a..ca4f7ff899 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1218,12 +1218,37 @@ static inline BOOL is_optional_argument(const VARIANT *arg) return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } +static WCHAR *split_command( BSTR cmd, WCHAR **params ) +{ + WCHAR *ret, *ptr; + BOOL in_quotes = FALSE; + + if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + strcpyW( ret, cmd ); + + *params = NULL; + for (ptr = ret; *ptr; ptr++) + { + if (*ptr == '"') in_quotes = !in_quotes; + else if (*ptr == ' ' && !in_quotes) + { + *ptr = 0; + *params = ptr + 1; + break; + } + } + + return ret; +} + static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; + WCHAR *file, *params; VARIANT s; HRESULT hr; + BOOL ret; TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); @@ -1251,13 +1276,18 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, waitforprocess = V_I4(&w); } + if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY; + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; - info.lpFile = cmd; + info.lpFile = file; + info.lpParameters = params; info.nShow = V_I4(&s); - if (!ShellExecuteExW(&info)) + ret = ShellExecuteExW(&info); + heap_free( file ); + if (!ret) { TRACE("ShellExecute failed, %d\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 18ff4d6228..c1f9519ff8 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -66,6 +66,17 @@ static void test_wshshell(void) static const WCHAR path2W[] = {'P','A','T','H',0}; static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; + static const WCHAR cmdexeW[] = {'\\','c','m','d','.','e','x','e',0}; + static const WCHAR testdirW[] = {'w','s','h','o','m',' ','t','e','s','t',' ','d','i','r',0}; + static const WCHAR paramsW[] = + {' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\','n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmdW[] = + {'c','m','d','.','e','x','e',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmd2W[] = + {'"','c','m','d','.','e','x','e',' ','"',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + WCHAR path[MAX_PATH], path2[MAX_PATH], buf[MAX_PATH]; IWshEnvironment *env; IWshExec *shexec; IWshShell3 *sh3; @@ -82,7 +93,7 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval; + DWORD retval, attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -238,9 +249,53 @@ static void test_wshshell(void) hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); ok(retval == 10, "got %u\n", retval); + SysFreeString(str); + + V_VT(&arg2) = VT_BOOL; + V_BOOL(&arg2) = VARIANT_TRUE; + retval = 0xdeadbeef; + str = SysAllocString(cmdW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); SysFreeString(str); + retval = 0xdeadbeef; + str = SysAllocString(cmd2W); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, cmdexeW); + attrs = GetFileAttributesW(path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "cmd.exe not found\n"); + + /* copy cmd.exe to a path with spaces */ + GetTempPathW(ARRAY_SIZE(path2), path2); + lstrcatW(path2, testdirW); + CreateDirectoryW(path2, NULL); + lstrcatW(path2, cmdexeW); + CopyFileW(path, path2, FALSE); + + buf[0] = '"'; + lstrcpyW(buf + 1, path2); + buf[lstrlenW(buf)] = '"'; + lstrcpyW(buf + lstrlenW(path2) + 2, paramsW); + + retval = 0xdeadbeef; + str = SysAllocString(buf); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + DeleteFileW(path2); + path2[lstrlenW(path2) - lstrlenW(cmdexeW)] = 0; + RemoveDirectoryW(path2); + /* current directory */ if (0) /* crashes on native */ hr = IWshShell3_get_CurrentDirectory(sh3, NULL); -- 2.11.0

Nov. 2, 2018

[PATCH] msi: Avoid duplicate product codes in FindRelatedProducts.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/upgrade.c | 68 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 36d65be8fe..034d891c1f 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -55,45 +55,59 @@ static BOOL check_language(DWORD lang1, LPCWSTR lang2, DWORD attributes) return (lang1 == langdword); } -static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, - LPCWSTR productid) +static BOOL find_product( const WCHAR *list, const WCHAR *product ) { - LPWSTR prop; - LPWSTR newprop; - DWORD len; - UINT r; - - prop = msi_dup_property(package->db, action_property ); - if (prop) - len = strlenW(prop); - else - len = 0; + const WCHAR *p = list, *q; - /*separator*/ - len ++; + if (!list) return FALSE; + for (;;) + { + while (*p && *p != '{') p++; + if (*p != '{') return FALSE; + q = p; + while (*q && *q != '}') q++; + if (*q != '}') return FALSE; + q++; + if (q - p < strlenW( product )) return FALSE; + if (!memcmp( p, product, (q - p) * sizeof(WCHAR) )) return TRUE; + p = q + 1; + while (*p && *p != ';') p++; + if (*p != ';') break; + } - len += strlenW(productid); + return FALSE; +} - /*null*/ - len++; +static void append_productcode( MSIPACKAGE *package, const WCHAR *action_prop, const WCHAR *product ) +{ + WCHAR *prop, *newprop; + DWORD len = 0; + UINT r; - newprop = msi_alloc( len*sizeof(WCHAR) ); + prop = msi_dup_property( package->db, action_prop ); + if (find_product( prop, product )) + { + TRACE( "related product property %s already contains %s\n", debugstr_w(action_prop), debugstr_w(product) ); + msi_free( prop ); + return; + } + if (prop) len += strlenW( prop ); + len += strlenW( product ) + 2; + if (!(newprop = msi_alloc( len * sizeof(WCHAR) ))) return; if (prop) { - strcpyW(newprop,prop); - strcatW(newprop,szSemiColon); + strcpyW( newprop, prop ); + strcatW( newprop, szSemiColon ); } - else - newprop[0] = 0; - strcatW(newprop,productid); + else newprop[0] = 0; + strcatW( newprop, product ); - r = msi_set_property( package->db, action_property, newprop, -1 ); - if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) + r = msi_set_property( package->db, action_prop, newprop, -1 ); + if (r == ERROR_SUCCESS && !strcmpW( action_prop, szSourceDir )) msi_reset_source_folders( package ); - TRACE("Found Related Product... %s now %s\n", - debugstr_w(action_property), debugstr_w(newprop)); + TRACE( "related product property %s now %s\n", debugstr_w(action_prop), debugstr_w(newprop) ); msi_free( prop ); msi_free( newprop ); -- 2.11.0

Nov. 2, 2018

Re: [PATCH] d3d11/tests: Add test for SO statistics queries.

by Henri Verbeet

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

Nov. 2, 2018