July 2017 - Wine-Commits - list.winehq.org

Alex Henrie : user32: Translate WM_(NC) XBUTTONUP to WM_APPCOMMAND in DefWindowProc.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 5e5661324016aec2fcdd5af369bf6bd08d2b894a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5661324016aec2fcdd5af36… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 22 23:17:07 2017 -0700 user32: Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2799be180439a09588888b0ce5854faef8fe4a4a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/defwnd.c | 9 +++++++++ dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e62f021..6fbaf1e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -291,6 +291,15 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa */ break; + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) + { + SendMessageW(hwnd, WM_APPCOMMAND, (WPARAM)hwnd, + MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); + } + break; + case WM_CONTEXTMENU: if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) SendMessageW( GetParent(hwnd), msg, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cd757b8..eba949b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14308,6 +14308,18 @@ static const struct message NCRBUTTONDOWNSeq[] = { 0 } }; +static const struct message NCXBUTTONUPSeq1[] = +{ + { WM_APPCOMMAND, sent|lparam, /*hwnd*/0, MAKELPARAM(0, FAPPCOMMAND_MOUSE | APPCOMMAND_BROWSER_BACKWARD) }, + { 0 } +}; + +static const struct message NCXBUTTONUPSeq2[] = +{ + { WM_APPCOMMAND, sent|lparam, /*hwnd*/0, MAKELPARAM(0, FAPPCOMMAND_MOUSE | APPCOMMAND_BROWSER_FORWARD) }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -14367,6 +14379,22 @@ static void test_defwinproc(void) DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP without button", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, XBUTTON1), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(NCXBUTTONUPSeq1, "WM_NCXBUTTONUP with XBUTTON1", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, XBUTTON2), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(NCXBUTTONUPSeq2, "WM_NCXBUTTONUP with XBUTTON2", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, 3), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished );

1 0

Alistair Leslie-Hughes : mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: a269f7234a083cbe6b67fa144e62fa00e479e806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a269f7234a083cbe6b67fa144… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 23 00:17:24 2017 -0700 mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0dc677c05fb71ba459ad20711af6637ab92e8847) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfreadwrite/main.c | 14 ++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index a72f634..d3feeaf 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -22,6 +22,11 @@ #include "windef.h" #include "winbase.h" +#include "mfreadwrite.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +41,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + + +HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + FIXME("%p %p %p stub.\n", source, attributes, reader); + + return E_NOTIMPL; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 1f9f30f..70b95a8 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -3,5 +3,5 @@ @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stub MFCreateSourceReaderFromByteStream -@ stub MFCreateSourceReaderFromMediaSource +@ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stub MFCreateSourceReaderFromURL

1 0

Piotr Caban : msvcr: Add _get_dstbias implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 0be8e5ca5d3dff1627fbe92c42e68b76f713bc82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be8e5ca5d3dff1627fbe92c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 18:23:38 2017 +0100 msvcr: Add _get_dstbias implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17186413fe81ab8cb13692d2b34808d89df48f55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/time.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 463ad7f..f5d4275 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -23,7 +23,7 @@ @ cdecl _futime32(long ptr) ucrtbase._futime32 @ cdecl _futime64(long ptr) ucrtbase._futime64 @ cdecl _get_daylight(ptr) ucrtbase._get_daylight -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) ucrtbase._get_dstbias @ cdecl _get_timezone(ptr) ucrtbase._get_timezone @ cdecl _get_tzname(ptr str long long) ucrtbase._get_tzname @ cdecl _getsystime(ptr) ucrtbase._getsystime diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4e0a5e7..7f0ad2d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -874,7 +874,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 25811f3..229bb7a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1221,7 +1221,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b6fafbb..30c7479 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1221,7 +1221,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0799aca..91a4785 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1149,7 +1149,7 @@ @ cdecl _get_current_locale() msvcr120._get_current_locale @ cdecl _get_daylight(ptr) msvcr120._get_daylight @ cdecl _get_doserrno(ptr) msvcr120._get_doserrno -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) msvcr120._get_dstbias @ cdecl _get_errno(ptr) msvcr120._get_errno @ cdecl _get_fmode(ptr) msvcr120._get_fmode @ cdecl _get_heap_handle() msvcr120._get_heap_handle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d488651..10d4d5a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -541,7 +541,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0157f42..0957db0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -524,7 +524,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c390df6..480d533 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -891,6 +891,16 @@ int * CDECL MSVCRT___p__dstbias(void) } /********************************************************************* + * _get_dstbias (MSVCR80.@) + */ +int CDECL MSVCRT__get_dstbias(int *seconds) +{ + if (!MSVCRT_CHECK_PMT(seconds != NULL)) return MSVCRT_EINVAL; + *seconds = MSVCRT__dstbias; + return 0; +} + +/********************************************************************* * __p__timezone (MSVCRT.@) */ MSVCRT_long * CDECL MSVCRT___p__timezone(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a3dcf9c..2239f03 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -361,7 +361,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle()

1 0

Hugh McMaster : regedit: Call TrackPopupMenu() from WM_CONTEXTMENU.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: d1ea810b28e33aaf5f9efa9fa179aa4da69448ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ea810b28e33aaf5f9efa9fa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:25 2017 +0000 regedit: Call TrackPopupMenu() from WM_CONTEXTMENU. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4dc5a764c781fa50530fcec7baf6a1e53256368c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/childwnd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 08eeec1..74e30f8 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -283,6 +283,9 @@ static void set_last_key(HWND hwndTV) } } +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + /******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) @@ -359,6 +362,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa draw_splitbar(hWnd, last_split); break; + case WM_CONTEXTMENU: { + int x = GET_X_LPARAM(lParam); + int y = GET_Y_LPARAM(lParam); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, x, y, 0, hFrameWnd, NULL); + } + case WM_KEYDOWN: if (wParam == VK_ESCAPE) if (GetCapture() == hWnd) { @@ -410,13 +419,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case NM_SETFOCUS: g_pChildWnd->nFocusPanel = 0; break; - case NM_RCLICK: { - POINT pt; - GetCursorPos(&pt); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), - TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); - break; - } case TVN_BEGINLABELEDITW: { HKEY hRootKey; LPWSTR path;

1 0

Hugh McMaster : comctl32: Improve right-click handling in treeview controls.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 9ee986cce4146fab330b3f7ebafef538eefb581a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee986cce4146fab330b3f7eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 4 12:42:49 2017 +0000 comctl32: Improve right-click handling in treeview controls. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d6a6055bc95b701ccb5b439739b975330a4f67c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 74206bd..9a37cf3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4347,7 +4347,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); - TREEVIEW_HitTest(infoPtr, &ht); + if (TREEVIEW_HitTest(infoPtr, &ht)) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4368,6 +4373,13 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } } + if (ht.hItem) + { + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + infoPtr->focusedItem = infoPtr->selectedItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + } + return 0; }

1 0

Piotr Caban : msvcrt: Fix handling of unsigned chars in scanf format.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 10e6abd7b3f0e11f12fc6379fe69bba754700a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e6abd7b3f0e11f12fc6379f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 31 15:02:48 2017 +0200 msvcrt: Fix handling of unsigned chars in scanf format. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32bb8d9068ae5282b6b10734579aaa2d5195a5af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index b2e6bd7..0fa1e6f 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -699,7 +699,7 @@ _FUNCTION_ { * a matching non-white-space character. */ else { /* check for character match */ - if (nch == *format) { + if (nch == (unsigned char)*format) { nch = _GETC_(file); } else break; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 6cb85fa..ecb270b 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -251,6 +251,10 @@ static void test_sscanf( void ) ok(ret == 2, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf %s\n", buffer); ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); + + ret = sscanf("\x81test", "\x81%s", buffer); + ok(ret == 1, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "buf = %s\n", buffer); } static void test_sscanf_s(void)

1 0

Piotr Caban : msvcr120: Add fesetround implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: ef3621ba6f6a06b8e69a390fc31591b5688d62cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3621ba6f6a06b8e69a390fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 31 16:05:35 2017 +0200 msvcr120: Add fesetround implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92651b9850a4d030a675e7c5b6809235f831f9d7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/math.c | 19 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 6cea910..57c5ecf 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -90,11 +90,11 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) ucrtbase.fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() ucrtbase.fegetround @ stub feholdexcept @ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) ucrtbase.fesetround @ stub fetestexcept @ cdecl perror(str) ucrtbase.perror @ stub quick_exit diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2a9c42c..b6fafbb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2146,14 +2146,14 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() MSVCRT_fegetround @ stub feholdexcept @ cdecl feof(ptr) MSVCRT_feof @ stub feraiseexcept @ cdecl ferror(ptr) MSVCRT_ferror @ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) MSVCRT_fesetround @ stub fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) MSVCRT_fflush diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ae200c7..0799aca 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1812,14 +1812,14 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() msvcr120.fegetround @ stub feholdexcept @ cdecl feof(ptr) msvcr120.feof @ stub feraiseexcept @ cdecl ferror(ptr) msvcr120.ferror @ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) msvcr120.fesetround @ stub fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) msvcr120.fflush diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 857561b..437aa15 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1232,6 +1232,25 @@ int CDECL __fpe_flt_rounds(void) } /********************************************************************* + * fegetround (MSVCR120.@) + */ +int CDECL MSVCRT_fegetround(void) +{ + return _controlfp(0, 0) & MSVCRT__RC_CHOP; +} + +/********************************************************************* + * fesetround (MSVCR120.@) + */ +int CDECL MSVCRT_fesetround(int round_mode) +{ + if (round_mode & (~MSVCRT__RC_CHOP)) + return 1; + _controlfp(round_mode, MSVCRT__RC_CHOP); + return 0; +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL MSVCRT__copysign(double num, double sign) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e57b6d6..a3dcf9c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2289,13 +2289,13 @@ @ stub feclearexcept @ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag -@ stub fegetround +@ cdecl fegetround() MSVCRT_fegetround @ stub feholdexcept @ cdecl feof(ptr) MSVCRT_feof @ cdecl ferror(ptr) MSVCRT_ferror @ cdecl fesetenv(ptr) MSVCRT_fesetenv @ stub fesetexceptflag -@ stub fesetround +@ cdecl fesetround(long) MSVCRT_fesetround @ stub fetestexcept @ cdecl fflush(ptr) MSVCRT_fflush @ cdecl fgetc(ptr) MSVCRT_fgetc

1 0

Gijs Vermeulen : msvcrt: Add stub for Concurrency::Alloc.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 52637cfbd44e8530c0ac072244c0d85797c48c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52637cfbd44e8530c0ac07224… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 12:27:44 2017 +0100 msvcrt: Add stub for Concurrency::Alloc. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32a4bec9099676ce1ade3fbd2871195f9596686c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/heap.c | 9 +++++++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index f1e522f..9c55598 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -217,8 +217,8 @@ @ stub -arch=i386 ??_F_Scheduler(a)details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F_Scheduler(a)details@Concurrency@@QEAAXXZ # extern ?AgentEventGuid(a)Concurrency@@3U_GUID@@B -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub -arch=win64 ?Block(a)Context@Concurrency@@SAXXZ # extern ?ChoreEventGuid(a)Concurrency@@3U_GUID@@B # extern ?ConcRTEventGuid(a)Concurrency@@3U_GUID@@B diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 739e408..4e0a5e7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -242,8 +242,8 @@ @ cdecl -arch=win64 ??_U(a)YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg @ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0c995e4..9e1dc05 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 772bcff..91bb3c1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -396,8 +396,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 37cbf0c..ae200c7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -393,8 +393,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) msvcr120.??_V(a)YAXPEAX@Z @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 3ae2599..f99f9c3 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -864,3 +864,12 @@ void msvcrt_destroy_heap(void) if(sb_heap) HeapDestroy(sb_heap); } + +/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ +/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ +void * CDECL Concurrency_Alloc(MSVCRT_size_t size) +{ + void *p = MSVCRT_malloc(size); + FIXME("(%ld) returning %p\n", size, p); + return p; +}

1 0

Piotr Caban : msvcrt: Add __ExceptionPtrCompare implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: f65fce4e27f2004541219393ee82e398d0ca2714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65fce4e27f2004541219393e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:14 2017 +0100 msvcrt: Add __ExceptionPtrCompare implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf7f632b31965b1f8ff6a4a69369326c4f146492) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 5 +++++ 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 8e92019..d373070 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1691,8 +1691,8 @@ @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 62815b6..739e408 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -410,8 +410,8 @@ @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9d0c993..0c995e4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -688,8 +688,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4b59e44..772bcff 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -670,8 +670,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4c6a373..37cbf0c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -666,8 +666,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index daf7aee..eedd0db 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1580,6 +1580,11 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, } #endif +MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2) +{ + return ep1->rec == ep2->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Fabian Maurer : user32/tests: Add WM_NCPAINT tests for windows crossing screen or maximized.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 0643a084fe99fef2aba525dfd49a662176881951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0643a084fe99fef2aba525dfd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:28 2017 +0100 user32/tests: Add WM_NCPAINT tests for windows crossing screen or maximized. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eba9294d9e4806882ffda21c4a3ca526153649be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 96bc594..11e31ad 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -758,7 +758,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ -static const struct message WmShowMaxPopupResizedSeq[] = { +static const struct message WmShowMaxPopupResizedSeq_todo[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, @@ -789,6 +789,37 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +static const struct message WmShowMaxPopupResizedSeq[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, + { WM_GETTEXT, sent|optional }, + { WM_NCPAINT, sent|optional }, /* We'll check WM_NCPAINT behaviour in another test */ + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent }, + /* WinNT4.0 sends WM_MOVE */ + { WM_MOVE, sent|defwinproc|optional }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; /* ShowWindow(SW_SHOWMAXIMIZED) for a not visible popup window */ static const struct message WmShowMaxPopupSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, @@ -927,6 +958,38 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_SHOWWINDOW }, { 0 } }; +/* CreateWindow (for a popup window with WS_VISIBLE style set and extreme location) + */ +static const struct message WmShowPopupExtremeLocationSeq[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent }, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { 0 } +}; /* CreateWindow (for a popup window with WS_VISIBLE style set) */ static const struct message WmShowPopupFirstDrawSeq_1[] = { @@ -4576,6 +4639,18 @@ static void test_showwindow(void) DestroyWindow(hwnd); flush_sequence(); + /* Test again, this time the NC_PAINT message */ + hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create popup window\n"); + SetWindowPos(hwnd, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ok_sequence(WmShowMaxPopupResizedSeq_todo, + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); + DestroyWindow(hwnd); + flush_sequence(); + /* Test 2: * 1. Create invisible maximized popup window. * 2. Show it maximized. @@ -5145,6 +5220,15 @@ static void test_messages(void) DestroyWindow(hchild); DestroyWindow(hparent); + /* Test message sequence for extreme position and size */ + + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP | WS_VISIBLE, + -10, -10, 10000, 10000, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + ok_sequence(WmShowPopupExtremeLocationSeq, "RedrawWindow:show_popup_extreme_location", TRUE); + DestroyWindow(hwnd); + /* Test child windows */

1 0