November 2017 - Wine-commits

Jacek Caban : mshtml: Merge olewnd.c into oleobj.c.
by Alexandre Julliard 17 Nov '17

17 Nov '17

Module: wine Branch: master Commit: e1c211eaee7450e240b937d3c95307b374b1ea9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c211eaee7450e240b937d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 17:46:20 2017 +0100 mshtml: Merge olewnd.c into oleobj.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/oleobj.c | 246 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/olewnd.c | 286 ------------------------------------------- 5 files changed, 246 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1c211eaee7450e240b93…

1 0

Zebediah Figura : kernel32/tests: Trace thread IDs in hexadecimal.
by Alexandre Julliard 17 Nov '17

17 Nov '17

Module: wine Branch: master Commit: 7ecf84c42193495a687ffc9328a67a489ba5a152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecf84c42193495a687ffc932… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 16 22:21:32 2017 -0600 kernel32/tests: Trace thread IDs in hexadecimal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1f6f317..6d532eb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1523,7 +1523,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; - trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); @@ -1531,7 +1531,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) else if (ret == WAIT_OBJECT_0 + 1) { ULONG_PTR loader_lock_magic; - trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); inside_loader_lock++; @@ -1539,21 +1539,21 @@ static DWORD WINAPI mutex_thread_proc(void *param) } else if (ret == WAIT_OBJECT_0 + 2) { - trace("%04u: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); pRtlAcquirePebLock(); inside_peb_lock++; SetEvent(ack_event); } else if (ret == WAIT_OBJECT_0 + 3) { - trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); HeapLock(GetProcessHeap()); inside_heap_lock++; SetEvent(ack_event); } } - trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1569,11 +1569,11 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { if (winetest_debug > 1) - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } - trace("%04u: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1585,7 +1585,7 @@ static DWORD WINAPI noop_thread_proc(void *param) InterlockedIncrement(noop_thread_started); } - trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: noop_thread_proc: exiting\n", GetCurrentThreadId()); return 195; }

1 0

Zebediah Figura : kernel32/tests: Don't close the stop_event handle.
by Alexandre Julliard 17 Nov '17

17 Nov '17

Module: wine Branch: master Commit: 74b1426bba56634d5e7ce24800b187bc1e8fe9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b1426bba56634d5e7ce2480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 16 22:21:33 2017 -0600 kernel32/tests: Don't close the stop_event handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6d532eb..17c7697 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2149,7 +2149,6 @@ static void child_process(const char *dll_name, DWORD target_offset) case 3: trace("signalling thread exit\n"); SetEvent(stop_event); - CloseHandle(stop_event); break; case 4:

1 0

Zebediah Figura : webservices: Stub WsAbortChannel().
by Alexandre Julliard 17 Nov '17

17 Nov '17

Module: wine Branch: master Commit: 48b581befd9288ff942a2ab3f8f23fe20cad4458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b581befd9288ff942a2ab3f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 16 13:18:19 2017 -0600 webservices: Stub WsAbortChannel(). Powerpoint 2016 calls this while loading some themes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 92569fd..9093a6c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2138,3 +2138,12 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + FIXME( "%p %p: stub!\n", handle, error ); + return E_NOTIMPL; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 53fe547..55f3e2e 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -1,6 +1,6 @@ @ stub WsAbandonCall @ stub WsAbandonMessage -@ stub WsAbortChannel +@ stdcall WsAbortChannel(ptr ptr) @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr)

1 0

André Hentschel : loader: We now have a preloader on ARM64.
by Alexandre Julliard 17 Nov '17

17 Nov '17

Module: wine Branch: master Commit: c459357b0d5881038d0c9efe9761eaabdb90bc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c459357b0d5881038d0c9efe9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 16 23:20:36 2017 +0100 loader: We now have a preloader on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index a560ec3..0a25272 100644 --- a/loader/main.c +++ b/loader/main.c @@ -195,11 +195,11 @@ static int pre_exec(void) #endif } -#elif defined(__linux__) && defined(__x86_64__) +#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) static int pre_exec(void) { - return 1; /* we have a preloader on x86-64 */ + return 1; /* we have a preloader on x86-64/arm64 */ } #elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__))

1 0

André Hentschel : libwine: Reserve memory areas for ARM64 in case we don't have a preloader.
by Alexandre Julliard 17 Nov '17

17 Nov '17

Module: wine Branch: master Commit: b0fc60d2794c870e33d9d22fd1369986520fcb83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc60d2794c870e33d9d22fd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 16 23:20:45 2017 +0100 libwine: Reserve memory areas for ARM64 in case we don't have a preloader. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1a3ca59..458cc13 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -398,7 +398,7 @@ void mmap_init(void) } reserve_dos_area(); -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) if (!list_head( &reserved_areas )) {

1 0

Alexandre Julliard : ntdll: Fall back to read() earlier on noexec filesystems.
by Alexandre Julliard 16 Nov '17

16 Nov '17

Module: wine Branch: master Commit: 42b79375d3c8ba4075a0819376fb4066bef2ef5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b79375d3c8ba4075a081937… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 20:08:11 2017 +0100 ntdll: Fall back to read() earlier on noexec filesystems. This avoid running into problems setting permissions later on. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 21ccdaa..1c62e57 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1307,6 +1307,39 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /*********************************************************************** + * map_pe_header + * + * Map the header of a PE file into memory. + */ +static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) +{ + if (!size) return STATUS_INVALID_IMAGE_FORMAT; + + if (!*removable) + { + if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != (void *)-1) + return STATUS_SUCCESS; + + switch (errno) + { + case EPERM: + WARN( "noexec file system, falling back to read\n" ); + break; + case ENOEXEC: + case ENODEV: + WARN( "file system doesn't support mmap, falling back to read\n" ); + break; + default: + return FILE_GetNtStatus(); + } + *removable = TRUE; + } + pread( fd, ptr, size, 0 ); + return STATUS_SUCCESS; /* page protections will be updated later */ +} + + +/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -1351,11 +1384,10 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, char *ba status = FILE_GetNtStatus(); goto error; } - status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ - if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); - if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - removable ) != STATUS_SUCCESS) goto error; + if ((status = map_pe_header( view->base, header_size, fd, &removable )) != STATUS_SUCCESS) goto error; + + status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size );

1 0

Nikolay Sivov : msvcp: Trace delimiter characters as single char strings.
by Alexandre Julliard 16 Nov '17

16 Nov '17

Module: wine Branch: master Commit: 0c7d67c5fa7080e7b970a1b7054ba067658cd56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7d67c5fa7080e7b970a1b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 16 15:25:55 2017 +0300 msvcp: Trace delimiter characters as single char strings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 16 ++++++++-------- dlls/msvcp90/ios.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f5dabbf..fea2ade 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7932,7 +7932,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -7978,7 +7978,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8022,7 +8022,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8724,7 +8724,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); MSVCP_basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { @@ -9400,7 +9400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -9450,7 +9450,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -9498,7 +9498,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10397,7 +10397,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); MSVCP_basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5d2f0ca..9ae9e65 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8414,7 +8414,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8460,7 +8460,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8504,7 +8504,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -9271,7 +9271,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); @@ -9957,7 +9957,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10007,7 +10007,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -10055,7 +10055,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -11018,7 +11018,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);

1 0

Akihiro Sagawa : winemac: Keep the result string in the IME UI window procedure.
by Alexandre Julliard 16 Nov '17

16 Nov '17

Module: wine Branch: master Commit: fdd376e514cc0f581dccf05946b17b254ec0aca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd376e514cc0f581dccf0594… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 17 00:12:13 2017 +0900 winemac: Keep the result string in the IME UI window procedure. This is winemac.drv port from winex11.drv. Please refer to b8dc1e7cde64c212882958c0806b50911a360fb9. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 846f9bd..8ea6ae8 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -965,6 +965,11 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, myPrivate->bInComposition = TRUE; } + /* clear existing result */ + newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + flags = GCS_COMPSTR; if (dwCompLen && lpComp) @@ -1166,7 +1171,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) LPCOMPOSITIONSTRING compstr; LPBYTE compdata; LPWSTR ResultStr; - HIMCC newCompStr; LPINPUTCONTEXT lpIMC; lpIMC = LockRealIMC(hIMC); @@ -1179,11 +1183,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); ImmUnlockIMCC(lpIMC->hCompStr); - - /* clear the buffer */ - newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; UnlockRealIMC(hIMC); } else

1 0

Akihiro Sagawa : imm32/tests: Add more WM_IME_CHAR message tests.
by Alexandre Julliard 16 Nov '17

16 Nov '17

Module: wine Branch: master Commit: 4f14f706a67d27288924950b0daf36b8e5b0e241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f14f706a67d27288924950b0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 17 00:12:15 2017 +0900 imm32/tests: Add more WM_IME_CHAR message tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 12e8f99..1ba02ff 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -369,13 +369,23 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR { case WM_IME_COMPOSITION: if ((lParam & GCS_RESULTSTR) && !ime_composition_test.catch_result_str) { + HWND hwndIme; WCHAR wstring[20]; HIMC imc; LONG size; LRESULT ret; + hwndIme = ImmGetDefaultIMEWnd(hWnd); + ok(hwndIme != NULL, "expected IME window existence\n"); + + ok(!ime_composition_test.catch_ime_char, "WM_IME_CHAR is sent\n"); ret = CallWindowProcA(ime_composition_test.old_wnd_proc, hWnd, msg, wParam, lParam); + ok(ime_composition_test.catch_ime_char, "WM_IME_CHAR isn't sent\n"); + + ime_composition_test.catch_ime_char = FALSE; + SendMessageA(hwndIme, msg, wParam, lParam); + todo_wine ok(!ime_composition_test.catch_ime_char, "WM_IME_CHAR is sent\n"); imc = ImmGetContext(hWnd); size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, @@ -388,7 +398,7 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR } break; case WM_IME_CHAR: - if (!ime_composition_test.catch_ime_char) + if (!ime_composition_test.catch_result_str) ime_composition_test.catch_ime_char = TRUE; break; case WM_TIMER: @@ -470,8 +480,6 @@ static void test_ImmGetCompositionString(void) msg_spy_flush_msgs(); ok(ime_composition_test.catch_result_str, "WM_IME_COMPOSITION(GCS_RESULTSTR) isn't sent\n"); - ok(ime_composition_test.catch_ime_char, - "WM_IME_CHAR isn't sent\n"); } else win_skip("Composition string isn't available\n"); @@ -495,8 +503,7 @@ static void test_ImmGetCompositionString(void) NULL, NULL, GetModuleHandleA(NULL), NULL); hwndChild = CreateWindowExA(0, "static", "Input a DBCS character here using IME.", - WS_CHILD | WS_VISIBLE | 0 - /* ES_AUTOHSCROLL | ES_MULTILINE */, + WS_CHILD | WS_VISIBLE, 0, 0, 320, 100, hwndMain, NULL, GetModuleHandleA(NULL), NULL); @@ -523,9 +530,6 @@ static void test_ImmGetCompositionString(void) } if (!ime_composition_test.catch_result_str) skip("WM_IME_COMPOSITION(GCS_RESULTSTR) isn't tested\n"); - else - ok(ime_composition_test.catch_ime_char, - "WM_IME_CHAR isn't sent\n"); msg_spy_flush_msgs(); } }

1 0