November 2017 - Wine-Commits

Vincent Povirk : twain_32: Implement source selection dialog.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

1 0

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

Nov. 17, 2017

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

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

Nov. 17, 2017

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

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

Nov. 17, 2017

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

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

Nov. 17, 2017

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

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

Nov. 17, 2017

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

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

Nov. 16, 2017

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 : user32: Send WM_IME_CHAR messages from DefWindowProc.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: 4adfb1be29a174f5f1eadb25fc3c6aba663cb3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adfb1be29a174f5f1eadb25f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 17 00:12:16 2017 +0900 user32: Send WM_IME_CHAR messages from DefWindowProc. 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 | 8 +------ dlls/user32/defwnd.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/ime.c | 58 +-------------------------------------------- dlls/winex11.drv/ime.c | 60 +---------------------------------------------- 4 files changed, 62 insertions(+), 125 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 1ba02ff..be3ddfc 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -385,7 +385,7 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR 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"); + ok(!ime_composition_test.catch_ime_char, "WM_IME_CHAR is sent\n"); imc = ImmGetContext(hWnd); size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, @@ -513,12 +513,6 @@ static void test_ImmGetCompositionString(void) SetFocus(hwndChild); - /* FIXME: In wine, IME UI window is created in ImmSetOpenStatus(). - So, we prepare it here to generate WM_IME_CHAR messages. */ - imc = ImmGetContext(hwndChild); - ImmSetOpenStatus(imc, FALSE); - ImmReleaseContext(hwndChild, imc); - ime_composition_test.timer_id = MY_TIMER; ime_composition_test.start = GetTickCount(); SetTimer(hwndChild, ime_composition_test.timer_id, 100, NULL); diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 235c139..c0d1190 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -854,8 +854,44 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam result = PostMessageA( hwnd, WM_KEYUP, wParam, lParam ); break; - case WM_IME_STARTCOMPOSITION: case WM_IME_COMPOSITION: + if (lParam & GCS_RESULTSTR) + { + LONG size, i; + unsigned char lead = 0; + char *buf = NULL; + HIMC himc = ImmGetContext( hwnd ); + + if (himc) + { + if ((size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, NULL, 0 ))) + { + if (!(buf = HeapAlloc( GetProcessHeap(), 0, size ))) size = 0; + else size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, buf, size ); + } + ImmReleaseContext( hwnd, himc ); + + for (i = 0; i < size; i++) + { + unsigned char c = buf[i]; + if (!lead) + { + if (IsDBCSLeadByte( c )) + lead = c; + else + SendMessageA( hwnd, WM_IME_CHAR, c, 1 ); + } + else + { + SendMessageA( hwnd, WM_IME_CHAR, MAKEWORD(c, lead), 1 ); + lead = 0; + } + } + HeapFree( GetProcessHeap(), 0, buf ); + } + } + /* fall through */ + case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: @@ -1006,8 +1042,29 @@ LRESULT WINAPI DefWindowProcW( } break; - case WM_IME_STARTCOMPOSITION: case WM_IME_COMPOSITION: + if (lParam & GCS_RESULTSTR) + { + LONG size, i; + WCHAR *buf = NULL; + HIMC himc = ImmGetContext( hwnd ); + + if (himc) + { + if ((size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, NULL, 0 ))) + { + if (!(buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) size = 0; + else size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) ); + } + ImmReleaseContext( hwnd, himc ); + + for (i = 0; i < size / sizeof(WCHAR); i++) + SendMessageW( hwnd, WM_IME_CHAR, buf[i], 1 ); + HeapFree( GetProcessHeap(), 0, buf ); + } + } + /* fall through */ + case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 8ea6ae8..00fb236 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -459,43 +459,6 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, LPARAM lParam UnlockRealIMC(hIMC); } -static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length) -{ - LPINPUTCONTEXT lpIMC; - LPTRANSMSG lpTransMsg; - DWORD i; - - if (length <= 0) - return; - - lpIMC = LockRealIMC(hIMC); - if (lpIMC == NULL) - return; - - lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + length) * sizeof(TRANSMSG)); - if (!lpIMC->hMsgBuf) - return; - - lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); - if (!lpTransMsg) - return; - - lpTransMsg += lpIMC->dwNumMsgBuf; - for (i = 0; i < length; i++) - { - lpTransMsg->message = WM_IME_CHAR; - lpTransMsg->wParam = String[i]; - lpTransMsg->lParam = 1; - lpTransMsg++; - } - - ImmUnlockIMCC(lpIMC->hMsgBuf); - lpIMC->dwNumMsgBuf += length; - - ImmGenerateMessage(RealIMC(hIMC)); - UnlockRealIMC(hIMC); -} - static BOOL GenerateMessageToTransKey(LPDWORD lpTransBuf, UINT *uNumTranMsgs, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -1166,26 +1129,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd) static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) { TRACE("IME message WM_IME_COMPOSITION 0x%lx\n", lParam); - if (lParam & GCS_RESULTSTR) - { - LPCOMPOSITIONSTRING compstr; - LPBYTE compdata; - LPWSTR ResultStr; - LPINPUTCONTEXT lpIMC; - - lpIMC = LockRealIMC(hIMC); - if (lpIMC == NULL) - return; - - TRACE("Posting result as IME_CHAR\n"); - compdata = ImmLockIMCC(lpIMC->hCompStr); - compstr = (LPCOMPOSITIONSTRING)compdata; - ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); - ImmUnlockIMCC(lpIMC->hCompStr); - UnlockRealIMC(hIMC); - } - else + if (!(lParam & GCS_RESULTSTR)) UpdateDataInDefaultIMEWindow(hIMC, hwnd, TRUE); } diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index d0746c5..2f90f853 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -496,45 +496,6 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, UnlockRealIMC(hIMC); } -static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length) -{ - LPINPUTCONTEXT lpIMC; - LPTRANSMSG lpTransMsg; - DWORD i; - - if (length <= 0) - return; - - lpIMC = LockRealIMC(hIMC); - if (lpIMC == NULL) - return; - - lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, - (lpIMC->dwNumMsgBuf + length) * - sizeof(TRANSMSG)); - if (!lpIMC->hMsgBuf) - return; - - lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); - if (!lpTransMsg) - return; - - lpTransMsg += lpIMC->dwNumMsgBuf; - for (i = 0; i < length; i++) - { - lpTransMsg->message = WM_IME_CHAR; - lpTransMsg->wParam = String[i]; - lpTransMsg->lParam = 1; - lpTransMsg ++; - } - - ImmUnlockIMCC(lpIMC->hMsgBuf); - lpIMC->dwNumMsgBuf+=length; - - ImmGenerateMessage(RealIMC(hIMC)); - UnlockRealIMC(hIMC); -} - static BOOL IME_RemoveFromSelected(HIMC hIMC) { int i; @@ -1256,26 +1217,7 @@ static void UpdateDefaultIMEWindow(HIMC hIMC, HWND hwnd) static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) { TRACE("IME message WM_IME_COMPOSITION 0x%lx\n", lParam); - if (lParam & GCS_RESULTSTR) - { - LPCOMPOSITIONSTRING compstr; - LPBYTE compdata; - LPWSTR ResultStr; - LPINPUTCONTEXT lpIMC; - - lpIMC = LockRealIMC(hIMC); - if (lpIMC == NULL) - return; - - TRACE("Posting result as IME_CHAR\n"); - compdata = ImmLockIMCC(lpIMC->hCompStr); - compstr = (LPCOMPOSITIONSTRING)compdata; - ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); - ImmUnlockIMCC(lpIMC->hCompStr); - UnlockRealIMC(hIMC); - } - else + if (!(lParam & GCS_RESULTSTR)) UpdateDefaultIMEWindow(hIMC, hwnd); }

1 0

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

Nov. 16, 2017

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

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

Nov. 16, 2017

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