October 2018 - Wine-Commits

Jacek Caban : ntdll: Use correct size when checking iosb in NtFlushBuffersFile (Coverity).
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 3d5a2567977455d04e4896368a71db74e7b9074b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5a2567977455d04e489636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 13:43:38 2018 +0100 ntdll: Use correct size when checking iosb in NtFlushBuffersFile (Coverity). Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 870ad06..622b5de 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3305,7 +3305,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) enum server_fd_type type; int fd, needs_close; - if (!io || !virtual_check_buffer_for_write( io, sizeof(io) )) return STATUS_ACCESS_VIOLATION; + if (!io || !virtual_check_buffer_for_write( io, sizeof(*io) )) return STATUS_ACCESS_VIOLATION; ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); if (ret == STATUS_ACCESS_DENIED)

1 0

Zebediah Figura : rpcrt4: Clarify local variables in PointerUnmarshall().
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 61fdcfdd368cf2781c5fdbb0e9870efc188abee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61fdcfdd368cf2781c5fdbb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 28 17:25:48 2018 -0500 rpcrt4: Clarify local variables in PointerUnmarshall(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2364301..aeac0cf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -950,26 +950,25 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, * whether we have to initialise it so we can use the optimisation of * setting the pointer to the buffer, if possible, or set fMustAlloc to * TRUE. */ - if (attr & FC_POINTER_DEREF) { + if (attr & FC_POINTER_DEREF) + { if (pSrcPointer && (attr & FC_ALLOCED_ON_STACK)) *pPointer = pSrcPointer; else fMustAlloc = TRUE; - } else { - *current_ptr = NULL; } + else + *pPointer = NULL; } if (attr & FC_ALLOCATE_ALL_NODES) FIXME("FC_ALLOCATE_ALL_NODES not implemented\n"); if (attr & FC_POINTER_DEREF) { - if (fMustAlloc) { - unsigned char *base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); - *pPointer = base_ptr_val; - current_ptr = (unsigned char **)base_ptr_val; - } else - current_ptr = *(unsigned char***)current_ptr; + if (fMustAlloc) + *pPointer = NdrAllocateZero(pStubMsg, sizeof(void *)); + + current_ptr = *(unsigned char***)current_ptr; TRACE("deref => %p\n", current_ptr); if (!fMustAlloc && !*current_ptr) fMustAlloc = TRUE; }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Use a helper function to show the listbox.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 3d9da1a691de1124a154683cdeef91b9d2e6faf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d9da1a691de1124a154683c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 25 21:04:51 2018 +0300 shell32/autocomplete: Use a helper function to show 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 | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8cf0243..b3f86f3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -109,6 +109,21 @@ static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd) SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); } +static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +{ + RECT r; + UINT width, height; + + GetWindowRect(ac->hwndEdit, &r); + SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); + + /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); + width = r.right - r.left; + + SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, width, height, SWP_SHOWWINDOW); +} + 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 @@ -339,15 +354,7 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, { if (cpt) { - RECT r; - UINT height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - /* 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, height * min(cpt + 1, 7), - SWP_SHOWWINDOW ); + show_listbox(ac, cpt); SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else

1 0

Alexandre Julliard : loader: Don't add the AT_UID entries if they don' t already exist.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: a2d76cb43f1dbe0d58781c416e4cc166ac61e974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d76cb43f1dbe0d58781c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 14:20:05 2018 +0100 loader: Don't add the AT_UID entries if they don't already exist. geteuid() etc. are broken on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 725926e..644244b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -330,34 +330,6 @@ __ASM_GLOBAL_FUNC(wld_mmap, __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "\tret\n" ) -static inline uid_t wld_getuid(void) -{ - uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (24 /* SYS_getuid */) ); - return ret; -} - -static inline uid_t wld_geteuid(void) -{ - uid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (49 /* SYS_geteuid */) ); - return ret; -} - -static inline gid_t wld_getgid(void) -{ - gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (47 /* SYS_getgid */) ); - return ret; -} - -static inline gid_t wld_getegid(void) -{ - gid_t ret; - __asm__( "int $0x80" : "=a" (ret) : "0" (50 /* SYS_getegid */) ); - return ret; -} - static inline int wld_prctl( int code, long arg ) { int ret; @@ -1282,7 +1254,7 @@ void* wld_start( void **stack ) long i, *pargc; char **argv, **p; char *interp, *reserve = NULL; - struct wld_auxv new_av[12], delete_av[3], *av; + struct wld_auxv new_av[8], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; @@ -1365,11 +1337,7 @@ void* wld_start( void **stack ) SET_NEW_AV( 4, AT_BASE, ld_so_map.l_addr ); SET_NEW_AV( 5, AT_FLAGS, get_auxiliary( av, AT_FLAGS, 0 ) ); SET_NEW_AV( 6, AT_ENTRY, main_binary_map.l_entry ); - SET_NEW_AV( 7, AT_UID, get_auxiliary( av, AT_UID, wld_getuid() ) ); - SET_NEW_AV( 8, AT_EUID, get_auxiliary( av, AT_EUID, wld_geteuid() ) ); - SET_NEW_AV( 9, AT_GID, get_auxiliary( av, AT_GID, wld_getgid() ) ); - SET_NEW_AV(10, AT_EGID, get_auxiliary( av, AT_EGID, wld_getegid() ) ); - SET_NEW_AV(11, AT_NULL, 0 ); + SET_NEW_AV( 7, AT_NULL, 0 ); #undef SET_NEW_AV i = 0;

1 0

Louis Lenders : iphlpapi: Add stub for GetIpInterfaceTable.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 5a675ea44aa1f0ac06f55e52528fe8d8cb45499c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a675ea44aa1f0ac06f55e52… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Oct 28 18:58:03 2018 +0100 iphlpapi: Add stub for GetIpInterfaceTable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46015 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ include/netioapi.h | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 30d9ed7..b4f77be 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -105,7 +105,7 @@ @ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry -#@ stub GetIpInterfaceTable +@ stdcall GetIpInterfaceTable( long ptr ) #@ stub GetIpNetEntry2 @ stdcall GetIpNetTable( ptr ptr long ) @ stdcall GetIpNetTable2( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6273949..5df4cd8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3304,3 +3304,12 @@ DWORD WINAPI GetIpNetTable2(ADDRESS_FAMILY family, PMIB_IPNET_TABLE2 *table) if (!once++) FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetIpInterfaceTable (IPHLPAPI.@) + */ +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE *table) +{ + FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index e9de7dd..a41bae0 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -140,6 +140,12 @@ typedef struct _MIB_IPINTERFACE_ROW BOOLEAN DisableDefaultRoutes; } MIB_IPINTERFACE_ROW, *PMIB_IPINTERFACE_ROW; +typedef struct _MIB_IPINTERFACE_TABLE +{ + ULONG NumEntries; + MIB_IPINTERFACE_ROW Table[ANY_SIZE]; +} MIB_IPINTERFACE_TABLE, *PMIB_IPINTERFACE_TABLE; + typedef struct _MIB_UNICASTIPADDRESS_ROW { SOCKADDR_INET Address; @@ -242,6 +248,7 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); +DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); NET_IFINDEX WINAPI if_nametoindex(PCSTR);

1 0

Louis Lenders : advapi32: Add stub for RegQueryReflectionKey.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 924fd31cadacab61a9d258c2abd9ad2df6729c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=924fd31cadacab61a9d258c2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Oct 28 22:39:38 2018 +0100 advapi32: Add stub for RegQueryReflectionKey. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45796 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 9 +++++++++ include/winreg.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 8ebc580..e870a5d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -668,7 +668,7 @@ @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) @ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) -# @ stub RegQueryReflectionKey +@ stdcall RegQueryReflectionKey(long ptr) @ stdcall RegQueryValueA(long str ptr ptr) @ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index a83341f..9989097 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1194,6 +1194,15 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW return RtlNtStatusToDosError( status ); } +/****************************************************************************** + * RegQueryReflectionKey [ADVAPI32.@] + */ +LONG WINAPI RegQueryReflectionKey( HKEY hkey, BOOL *is_reflection_disabled ) +{ + FIXME( "%p, %p stub\n", hkey, is_reflection_disabled ); + *is_reflection_disabled = TRUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} /****************************************************************************** * RegCloseKey [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index ddbd929..51e9f02 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,7 @@ WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,L WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); #define RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues) +WINADVAPI LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); WINADVAPI LSTATUS WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue)

1 0

Jacek Caban : kernel32: Wait on pipe handle in TransactNamedPipe if needed.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 4fc5aff50981687a7cb7c3599a47da7cbb44d4e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc5aff50981687a7cb7c359… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 16:08:27 2018 +0100 kernel32: Wait on pipe handle in TransactNamedPipe if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index f3bd962..6d47d70 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1746,6 +1746,11 @@ BOOL WINAPI TransactNamedPipe( status = NtFsControlFile(handle, event, NULL, cvalue, iosb, FSCTL_PIPE_TRANSCEIVE, write_buf, write_size, read_buf, read_size); + if (status == STATUS_PENDING && !overlapped) + { + WaitForSingleObject(handle, INFINITE); + status = iosb->u.Status; + } if (bytes_read) *bytes_read = overlapped && status ? 0 : iosb->Information;

1 0

Zebediah Figura : rpcrt4: Add comments explaining the arguments to EmbeddedPointerUnmarshall().
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: c3db8982d4072cd2eb0f8c33d9d8741bc7feee4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3db8982d4072cd2eb0f8c33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 28 17:25:46 2018 -0500 rpcrt4: Add comments explaining the arguments to EmbeddedPointerUnmarshall(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b48b300..d1edf2c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -856,9 +856,9 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, STD_OVERFLOW_CHECK(pStubMsg); } -/*********************************************************************** - * PointerUnmarshall [internal] - */ +/* pPointer is the pointer that we will unmarshal into; pSrcPointer is the + * pointer to memory which we may attempt to reuse if non-NULL. Usually these + * are the same; for the case when they aren't, see EmbeddedPointerUnmarshall(). */ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *Buffer, unsigned char **pPointer, @@ -1228,9 +1228,14 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } -/*********************************************************************** - * EmbeddedPointerUnmarshall - */ +/* rpcrt4 does something bizarre with embedded pointers: instead of copying the + * struct/array/union from the buffer to memory and then unmarshalling pointers + * into it, it unmarshals pointers into the buffer itself and then copies it to + * memory. However, it will still attempt to use a user-supplied pointer where + * appropriate (i.e. one on stack). Therefore we need to pass both pointers to + * this function and to PointerUnmarshall: the pointer (to the buffer) that we + * will actually unmarshal into (pDstBuffer), and the pointer (to memory) that + * we will attempt to use for storage if possible (pSrcMemoryPtrs). */ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pDstBuffer, unsigned char *pSrcMemoryPtrs,

1 0

Gabriel Ivăncescu : shell32/autocomplete: Fill and display the auto-suggest listbox in a separate function.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: ec3b39fa221eb659cf5834ae07ef8514e1536be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3b39fa221eb659cf5834ae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 25 21:04:50 2018 +0300 shell32/autocomplete: Fill and display the auto-suggest listbox in a separate function. 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 | 77 ++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index dfe7638..8cf0243 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -293,40 +293,11 @@ static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR * heap_free(tmp); } -static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) +static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, + HWND hwnd, enum autoappend_flag flag) { - HRESULT hr; - WCHAR *text; - UINT cpt, size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); - - if (flag != autoappend_flag_displayempty && len == 0) - { - if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox); - 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)); - - /* Reset it here to simplify the logic in aclist_expand for - empty strings, since it tracks changes using txtbackup, - and Reset needs to be called before IACList::Expand */ - IEnumString_Reset(ac->enumstr); - if (ac->aclist) - { - aclist_expand(ac, text); - if (text[len - 1] == '\\' || text[len - 1] == '/') - flag = autoappend_flag_no; - } - - /* Set txtbackup to point to text itself (which must not be released) */ - heap_free(ac->txtbackup); - ac->txtbackup = text; + /* Return FALSE if we need to hide the listbox */ + UINT cpt; if (ac->options & ACO_AUTOSUGGEST) { @@ -335,6 +306,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ } for (cpt = 0;;) { + HRESULT hr; LPOLESTR strs = NULL; ULONG fetched; @@ -379,8 +351,47 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); } else + return FALSE; + } + return TRUE; +} + +static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) +{ + WCHAR *text; + UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + + if (flag != autoappend_flag_displayempty && len == 0) + { + if (ac->options & ACO_AUTOSUGGEST) hide_listbox(ac, ac->hwndListBox); + 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)); + + /* Reset it here to simplify the logic in aclist_expand for + empty strings, since it tracks changes using txtbackup, + and Reset needs to be called before IACList::Expand */ + IEnumString_Reset(ac->enumstr); + if (ac->aclist) + { + aclist_expand(ac, text); + if (text[len - 1] == '\\' || text[len - 1] == '/') + flag = autoappend_flag_no; + } + + /* Set txtbackup to point to text itself (which must not be released) */ + heap_free(ac->txtbackup); + ac->txtbackup = text; + + if (!display_matching_strs(ac, text, len, hwnd, flag)) + hide_listbox(ac, ac->hwndListBox); } static void destroy_autocomplete_object(IAutoCompleteImpl *ac)

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: eb7e3f88683e738108c19994f5296811aa93be5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7e3f88683e738108c19994… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Oct 30 20:26:27 2018 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 2007 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 994 insertions(+), 1013 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb7e3f88683e738108c1…

1 0