May 2018 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Stop exporting REG_SZ data at the first NUL character.
by Alexandre Julliard 08 May '18

08 May '18

Module: wine Branch: master Commit: 0aead094a5f7b772439ea5f125308155997864c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aead094a5f7b772439ea5f1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 7 23:50:45 2018 +0000 reg: Stop exporting REG_SZ data at the first NUL character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 11 ++++++----- programs/reg/tests/reg.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 622e7ca..8b08da1 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -39,7 +39,10 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) for (i = 0, escape_count = 0; i < str_len; i++) { WCHAR c = str[i]; - if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + + if (!c) break; + + if (c == '\r' || c == '\n' || c == '\\' || c == '"') escape_count++; } @@ -49,6 +52,8 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) { WCHAR c = str[i]; + if (!c) break; + switch (c) { case '\r': @@ -67,10 +72,6 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) buf[pos++] = '\\'; buf[pos] = '"'; break; - case '\0': - buf[pos++] = '\\'; - buf[pos] = '0'; - break; default: buf[pos] = c; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index aba71b7..ea4e128 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4679,7 +4679,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Nikolay Sivov : comctl32/trackbar: Fix reseting to default page size.
by Alexandre Julliard 08 May '18

08 May '18

Module: wine Branch: master Commit: 38e715387da75458874a22efb34419cc469f9624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38e715387da75458874a22ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 01:30:52 2018 +0300 comctl32/trackbar: Fix reseting to default page size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 11 +++++++++++ dlls/comctl32/trackbar.c | 31 +++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7d66df7..7f17e9e4b 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -613,6 +613,17 @@ static void test_page_size(void) r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); ok(r == 10, "Unexpected page size %d.\n", r); + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, -1); + ok(r == 10, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 7, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 100); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 19, "Unexpected page size %d.\n", r); + DestroyWindow(hWndTrackbar); hWndTrackbar = create_trackbar(defaultstyle, hWndParent); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 762d2e1..d774823 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1196,18 +1196,30 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) return lTemp; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; - if (lPageSize != -1) - infoPtr->lPageSize = lPageSize; + if (lPageSize == -1) + { + infoPtr->flags &= ~TB_USER_PAGE; + TRACKBAR_UpdatePageSize(infoPtr); + } else - infoPtr->lPageSize = TB_DEFAULTPAGESIZE; - - infoPtr->flags |= TB_USER_PAGE; + { + infoPtr->flags |= TB_USER_PAGE; + infoPtr->lPageSize = lPageSize; + } return lTemp; } @@ -1234,15 +1246,6 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } -static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) -{ - if (infoPtr->flags & TB_USER_PAGE) - return; - - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; -} - static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) {

1 0

Zebediah Figura : dmoguids: Add library.
by Alexandre Julliard 08 May '18

08 May '18

Module: wine Branch: master Commit: 1fc00f17696ca361447ed71979c12f75279abcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc00f17696ca361447ed719… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 7 21:17:42 2018 -0500 dmoguids: Add library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dmoguids/Makefile.in | 4 ++++ dlls/dmoguids/dmoguids.c | 27 +++++++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/configure b/configure index a2adb44..50badb7 100755 --- a/configure +++ b/configure @@ -1213,6 +1213,7 @@ enable_dmband enable_dmcompos enable_dmime enable_dmloader +enable_dmoguids enable_dmscript enable_dmstyle enable_dmsynth @@ -18573,6 +18574,7 @@ wine_fn_config_makefile dlls/dmime enable_dmime wine_fn_config_makefile dlls/dmime/tests enable_tests wine_fn_config_makefile dlls/dmloader enable_dmloader wine_fn_config_makefile dlls/dmloader/tests enable_tests +wine_fn_config_makefile dlls/dmoguids enable_dmoguids wine_fn_config_makefile dlls/dmscript enable_dmscript wine_fn_config_makefile dlls/dmscript/tests enable_tests wine_fn_config_makefile dlls/dmstyle enable_dmstyle diff --git a/configure.ac b/configure.ac index 6064081..c5e222d 100644 --- a/configure.ac +++ b/configure.ac @@ -3194,6 +3194,7 @@ WINE_CONFIG_MAKEFILE(dlls/dmime) WINE_CONFIG_MAKEFILE(dlls/dmime/tests) WINE_CONFIG_MAKEFILE(dlls/dmloader) WINE_CONFIG_MAKEFILE(dlls/dmloader/tests) +WINE_CONFIG_MAKEFILE(dlls/dmoguids) WINE_CONFIG_MAKEFILE(dlls/dmscript) WINE_CONFIG_MAKEFILE(dlls/dmscript/tests) WINE_CONFIG_MAKEFILE(dlls/dmstyle) diff --git a/dlls/dmoguids/Makefile.in b/dlls/dmoguids/Makefile.in new file mode 100644 index 0000000..db38e57 --- /dev/null +++ b/dlls/dmoguids/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libdmoguids.a + +C_SRCS = \ + dmoguids.c diff --git a/dlls/dmoguids/dmoguids.c b/dlls/dmoguids/dmoguids.c new file mode 100644 index 0000000..b764c1f --- /dev/null +++ b/dlls/dmoguids/dmoguids.c @@ -0,0 +1,27 @@ +/* + * GUID definitions + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Don't define those GUIDs here */ +#include "strmif.h" + +#include "initguid.h" + +#include "mediaobj.h" +#include "dmoreg.h"

1 0

Zebediah Figura : msdmo: Link to dmoguids.
by Alexandre Julliard 08 May '18

08 May '18

Module: wine Branch: master Commit: cf9c6fc0e3bd3ee3f271ad7e1079ffe51851f697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf9c6fc0e3bd3ee3f271ad7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 7 21:17:43 2018 -0500 msdmo: Link to dmoguids. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/Makefile.in | 2 +- dlls/msdmo/dmoreg.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index f359eef..566461e 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -1,6 +1,6 @@ MODULE = msdmo.dll IMPORTLIB = msdmo -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = dmoguids uuid ole32 user32 advapi32 C_SRCS = \ dmoreg.c \ diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 67ba498..ead8864 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -29,7 +29,6 @@ #include "objbase.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "initguid.h" #include "dmo.h" WINE_DEFAULT_DEBUG_CHANNEL(msdmo);

1 0

Nikolay Sivov : user32: Avoid touching last error on successful path of GetClassInfo().
by Alexandre Julliard 08 May '18

08 May '18

Module: wine Branch: master Commit: c4fd1099dd34e6a26af64da5f0fd672dcad1ad59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4fd1099dd34e6a26af64da5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 10:54:40 2018 +0300 user32: Avoid touching last error on successful path of GetClassInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 5 ++++- dlls/user32/tests/class.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index d4e7951..ce2830f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -333,6 +333,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B ULONG module_offset; } *wndclass; const WCHAR *module, *ret; + UNICODE_STRING name_us; HMODULE hmod; if (basename_offset) @@ -345,7 +346,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; data.cbSize = sizeof(data); - if (!FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data)) + RtlInitUnicodeString(&name_us, name); + if (RtlFindActivationContextSectionString(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + &name_us, &data)) return name; wndclass = (struct wndclass_redirect_data *)data.lpData; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index a9eee41..92b9ad9 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -998,6 +998,7 @@ if (0) { /* crashes under XP */ SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Unexpected error code %d\n", GetLastError()); ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); ok(wcx.lpfnWndProc != NULL, "got null proc\n");

1 0

Francois Gouget : testbot: Move the job scheduler to WineTestBot::Engine:: Scheduler.
by Alexandre Julliard 08 May '18

08 May '18

Module: tools Branch: master Commit: 91152c30e149c9cc43f0dba1525219418003f2b6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=91152c30e149c9cc43f0dba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 8 13:04:03 2018 +0200 testbot: Move the job scheduler to WineTestBot::Engine::Scheduler. The job scheduler is specific to the TestBot engine so ScheduleJobs() should not be in the Jobs package which is meant to be used by any process that deals with jobs. The scheduler could even be part of Engine.pl but since it's pretty self-contained it makes more sense to put it in its own package, hence WineTestBot::Engine:Scheduler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + testbot/lib/WineTestBot/Engine/Scheduler.pm | 978 ++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Jobs.pm | 943 +-------------------------- 3 files changed, 980 insertions(+), 942 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=91152c30e149c9cc43f…

1 0

Francois Gouget : testbot: Standardize logging in the job scheduler.
by Alexandre Julliard 08 May '18

08 May '18

Module: tools Branch: master Commit: 82c686c9b37270aae4d384896629dc198b2796ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=82c686c9b37270aae4d3848… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 8 13:04:16 2018 +0200 testbot: Standardize logging in the job scheduler. Generic WineTestBot modules such as Jobs are supposed to let higher level layers handle the logging or errors. But since the job scheduler is part of the Engine it can log errors itself. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index fbe1604..4eef3c9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -32,6 +32,7 @@ our @EXPORT = qw(ScheduleJobs CheckJobs); use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Log; use WineTestBot::RecordGroups; use WineTestBot::VMs; @@ -306,8 +307,7 @@ sub _CheckAndClassifyVMs() } else { - require WineTestBot::Log; - WineTestBot::Log::LogMsg("Unexpected $VMKey status ". $VM->Status ."\n"); + LogMsg "Unexpected $VMKey status ". $VM->Status ."\n"; $FoundVMErrors = 1; # Don't interfere with this VM $Sched->{busyvms}->{$VMKey} = 1; @@ -352,8 +352,7 @@ sub _CheckAndClassifyVMs() } elsif ($VM->Status ne "off") { - require WineTestBot::Log; - WineTestBot::Log::LogMsg("Unexpected $VMKey status ". $VM->Status ."\n"); + LogMsg "Unexpected $VMKey status ". $VM->Status ."\n"; $FoundVMErrors = 1; # Don't interfere with this VM $Sched->{busyvms}->{$VMKey} = 1; @@ -738,8 +737,7 @@ sub _DumpHostCounters($$) my $HostKey = $VM->GetHost(); my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey; - require WineTestBot::Log; - WineTestBot::Log::LogMsg("$PrettyHost:$Counters\n") if ($Counters); + LogMsg "$PrettyHost:$Counters\n" if ($Counters); $Host->{dumpedcounters} = 1; } @@ -778,8 +776,7 @@ sub _DumpHostVMs($$$$) } my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey; - require WineTestBot::Log; - WineTestBot::Log::LogMsg("$PrettyHost: @VMInfo\n"); + LogMsg "$PrettyHost: @VMInfo\n"; $Host->{dumpedvms} = 1; }

1 0

Alexandre Julliard : Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE. "
by Alexandre Julliard 07 May '18

07 May '18

Module: wine Branch: master Commit: 1f17051028cd721b04f1829922e3525df5cd2308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f17051028cd721b04f18299… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 6 11:09:33 2018 +0200 Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE." This reverts commit 38a76ecb0386d37d30b06b7947ed52be77ec9f1e. It has no effect, the coordinates are identical either way. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c1b55b5..b4be7f0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1924,7 +1924,6 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) { HWND parent; RECT window_rect; - POINT pt; WND *wndPtr = WIN_GetPtr( winpos->hwnd ); BOOL ret = TRUE; @@ -1956,15 +1955,12 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) if (!(winpos->flags & SWP_SHOWWINDOW)) winpos->flags |= SWP_NOREDRAW; } - WIN_GetRectangles( winpos->hwnd, COORDS_SCREEN, &window_rect, NULL ); + WIN_GetRectangles( winpos->hwnd, COORDS_PARENT, &window_rect, NULL ); if ((window_rect.right - window_rect.left == winpos->cx) && (window_rect.bottom - window_rect.top == winpos->cy)) winpos->flags |= SWP_NOSIZE; /* Already the right size */ - pt.x = winpos->x; - pt.y = winpos->y; - ClientToScreen( parent, &pt ); - if ((window_rect.left == pt.x) && (window_rect.top == pt.y)) + if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y)) winpos->flags |= SWP_NOMOVE; /* Already the right position */ if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)

1 0

Alexandre Julliard : user32: Avoid repeatedly fetching the window rectangles in SetWindowPos.
by Alexandre Julliard 07 May '18

07 May '18

Module: wine Branch: master Commit: bc956d8aa66aa13d42d568830251e4c60f20922a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc956d8aa66aa13d42d56883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 11:49:17 2018 +0200 user32: Avoid repeatedly fetching the window rectangles in SetWindowPos. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 101 +++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc956d8aa66aa13d42d5…

1 0

Alexandre Julliard : user32: Take into account the offset between old and new parent in SetParent().
by Alexandre Julliard 07 May '18

07 May '18

Module: wine Branch: master Commit: e95d0c684915c625aba0bfe4332a6c3e5259701c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95d0c684915c625aba0bfe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 12:00:17 2018 +0200 user32: Take into account the offset between old and new parent in SetParent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 23 +++++++++++++++-------- dlls/user32/winpos.c | 25 +++++++++++++------------ 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d2e6a75..79ea577 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1858,7 +1858,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return WIN_DestroyWindow( hwnd ); case WM_WINE_SETWINDOWPOS: if (is_desktop_window( hwnd )) return 0; - return USER_SetWindowPos( (WINDOWPOS *)lparam ); + return USER_SetWindowPos( (WINDOWPOS *)lparam, 0, 0 ); case WM_WINE_SHOWWINDOW: if (is_desktop_window( hwnd )) return 0; return ShowWindow( hwnd, wparam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 69841d3..a0f2cbe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15433,7 +15433,7 @@ static void test_SetParent(void) SetParent(child, parent2); flush_events(); - ok_sequence(WmSetParentSeq_1, "SetParent() visible WS_CHILD", TRUE); + ok_sequence(WmSetParentSeq_1, "SetParent() visible WS_CHILD", FALSE); ok(GetWindowLongA(child, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); ok(!IsWindowVisible(child), "IsWindowVisible() should return FALSE\n"); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 30ab511..9699297 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -254,7 +254,7 @@ extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN; -extern BOOL USER_SetWindowPos( WINDOWPOS * winpos ) DECLSPEC_HIDDEN; +extern BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7bb0088..0d694a1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3014,12 +3014,13 @@ HWND WINAPI GetAncestor( HWND hwnd, UINT type ) */ HWND WINAPI SetParent( HWND hwnd, HWND parent ) { + WINDOWPOS winpos; HWND full_handle; HWND old_parent = 0; BOOL was_visible; WND *wndPtr; - POINT pt; BOOL ret; + RECT window_rect, old_screen_rect, new_screen_rect; TRACE("(%p %p)\n", hwnd, parent); @@ -3062,8 +3063,8 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; - pt.x = wndPtr->rectWindow.left; - pt.y = wndPtr->rectWindow.top; + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, NULL ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &old_screen_rect, NULL ); SERVER_START_REQ( set_parent ) { @@ -3082,11 +3083,17 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) USER_Driver->pSetParent( full_handle, parent, old_parent ); - /* SetParent additionally needs to make hwnd the topmost window - in the x-order and send the expected WM_WINDOWPOSCHANGING and - WM_WINDOWPOSCHANGED notification messages. - */ - SetWindowPos( hwnd, HWND_TOP, pt.x, pt.y, 0, 0, SWP_NOSIZE ); + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = 0; + winpos.cy = 0; + winpos.flags = SWP_NOSIZE; + + WIN_GetRectangles( hwnd, COORDS_SCREEN, &new_screen_rect, NULL ); + USER_SetWindowPos( &winpos, new_screen_rect.left - old_screen_rect.left, + new_screen_rect.top - old_screen_rect.top ); if (was_visible) ShowWindow( hwnd, SW_SHOW ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 434fe6e..19ab297 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1855,7 +1855,8 @@ done: * SWP_DoNCCalcSize */ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, const RECT *old_client_rect, - const RECT *new_window_rect, RECT *new_client_rect, RECT *validRects ) + const RECT *new_window_rect, RECT *new_client_rect, RECT *validRects, + int parent_x, int parent_y ) { UINT wvrFlags = 0; @@ -1879,8 +1880,8 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c wine_dbgstr_rect(old_window_rect), wine_dbgstr_rect(old_client_rect), wine_dbgstr_rect(new_window_rect), wine_dbgstr_rect(new_client_rect) ); - if (new_client_rect->left != old_client_rect->left || - new_client_rect->top != old_client_rect->top) + if (new_client_rect->left != old_client_rect->left - parent_x || + new_client_rect->top != old_client_rect->top - parent_y) pWinpos->flags &= ~SWP_NOCLIENTMOVE; if( (new_client_rect->right - new_client_rect->left != @@ -1901,8 +1902,8 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c else { if (!(pWinpos->flags & SWP_NOMOVE) && - (new_client_rect->left != old_client_rect->left || - new_client_rect->top != old_client_rect->top)) + (new_client_rect->left != old_client_rect->left - parent_x || + new_client_rect->top != old_client_rect->top - parent_y)) pWinpos->flags &= ~SWP_NOCLIENTMOVE; } @@ -1917,7 +1918,7 @@ static UINT SWP_DoNCCalcSize( WINDOWPOS *pWinpos, const RECT *old_window_rect, c } /* fix redundant flags and values in the WINDOWPOS structure */ -static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect ) +static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int parent_x, int parent_y ) { HWND parent; WND *wndPtr = WIN_GetPtr( winpos->hwnd ); @@ -1955,7 +1956,7 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect ) (old_window_rect->bottom - old_window_rect->top == winpos->cy)) winpos->flags |= SWP_NOSIZE; /* Already the right size */ - if ((old_window_rect->left == winpos->x) && (old_window_rect->top == winpos->y)) + if ((old_window_rect->left - parent_x == winpos->x) && (old_window_rect->top - parent_y == winpos->y)) winpos->flags |= SWP_NOMOVE; /* Already the right position */ if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD) @@ -2203,7 +2204,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, * * User32 internal function */ -BOOL USER_SetWindowPos( WINDOWPOS * winpos ) +BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) { RECT old_window_rect, old_client_rect, new_window_rect, new_client_rect, valid_rects[2]; UINT orig_flags; @@ -2251,7 +2252,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) &new_window_rect, &new_client_rect )) return FALSE; /* Fix redundant flags */ - if (!fixup_flags( winpos, &old_window_rect )) return FALSE; + if (!fixup_flags( winpos, &old_window_rect, parent_x, parent_y )) return FALSE; if((winpos->flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != SWP_NOZORDER) { @@ -2262,7 +2263,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) /* Common operations */ SWP_DoNCCalcSize( winpos, &old_window_rect, &old_client_rect, - &new_window_rect, &new_client_rect, valid_rects ); + &new_window_rect, &new_client_rect, valid_rects, parent_x, parent_y ); if (!set_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, &new_window_rect, &new_client_rect, valid_rects )) @@ -2350,7 +2351,7 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, winpos.flags = flags; if (WIN_IsCurrentThread( hwnd )) - return USER_SetWindowPos(&winpos); + return USER_SetWindowPos( &winpos, 0, 0 ); return SendMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); } @@ -2499,7 +2500,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) winpos->cx, winpos->cy, winpos->flags); if (WIN_IsCurrentThread( winpos->hwnd )) - USER_SetWindowPos( winpos ); + USER_SetWindowPos( winpos, 0, 0 ); else SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); }

1 0