wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Dmitry Timoshkov : user32: Make more ShowWindow tests pass under Wine.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 92faf7aa96bab1e8da4534f1f4ac437d6559b4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=92faf7aa96bab1e8da4534f1f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Dec 31 17:27:23 2006 +0800 user32: Make more ShowWindow tests pass under Wine. --- dlls/user32/tests/msg.c | 14 +++++++------- dlls/winex11.drv/winpos.c | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 601d967..8179517 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8547,7 +8547,7 @@ static void test_ShowWindow(void) } sw[] = { /* 1 */ { SW_SHOWNORMAL, FALSE, WS_VISIBLE, WmShowNormal, TRUE }, -/* 2 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, +/* 2 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 3 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 4 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 5 */ { SW_SHOWMINIMIZED, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinimized_1, FALSE }, @@ -8559,7 +8559,7 @@ static void test_ShowWindow(void) /* 11 */ { SW_HIDE, TRUE, WS_MAXIMIZE, WmHide_1, FALSE }, /* 12 */ { SW_HIDE, FALSE, WS_MAXIMIZE, WmEmptySeq, FALSE }, /* 13 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_1, FALSE }, -/* 14 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, +/* 14 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 15 */ { SW_HIDE, TRUE, 0, WmHide_2, FALSE }, /* 16 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, FALSE }, @@ -8576,15 +8576,15 @@ static void test_ShowWindow(void) /* 28 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 29 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, /* 30 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_1, FALSE }, -/* 31 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, +/* 31 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 32 */ { SW_HIDE, TRUE, 0, WmHide_3, TRUE }, /* 33 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 34 */ { SW_NORMALNA, FALSE, 0, WmEmptySeq, TRUE }, /* what does this mean?! */ /* 35 */ { SW_NORMALNA, FALSE, 0, WmEmptySeq, TRUE }, /* 36 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 37 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_2, TRUE }, -/* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, -/* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, +/* 37 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_2, FALSE }, +/* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, +/* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, TRUE }, /* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, TRUE }, @@ -8596,7 +8596,7 @@ static void test_ShowWindow(void) /* 48 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_3, FALSE }, /* 49 */ { SW_SHOW, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmEmptySeq, FALSE }, /* 50 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmRestore_5, FALSE }, -/* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, +/* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, TRUE }, diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 317500d..ab2080b 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -618,8 +618,6 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* fall through */ case SW_RESTORE: - swp |= SWP_FRAMECHANGED; - if (!wasVisible) swp |= SWP_SHOWWINDOW; /* fall through */ case SW_SHOWNORMAL: /* same as SW_NORMAL: */ case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ @@ -631,6 +629,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c } else { + if (wasVisible) return TRUE; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER;

1 0

Dmitry Timoshkov : kernel32: Make the locale test pass without errors under XP SP2.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: ebd57713aa316a1f7f759cab6d61db557beb807e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd57713aa316a1f7f759cab6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Dec 31 21:11:50 2006 +0800 kernel32: Make the locale test pass without errors under XP SP2. --- dlls/kernel32/tests/locale.c | 51 ++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebd57713aa316a1f7f759…

1 0

Dmitry Timoshkov : ntdll: Map ESPIPE to STATUS_ILLEGAL_FUNCTION.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: b5cce1e52552152bcb694c5116c4c8364c396abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cce1e52552152bcb694c511… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Dec 31 17:28:23 2006 +0800 ntdll: Map ESPIPE to STATUS_ILLEGAL_FUNCTION. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0d9e7df..038b755 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -371,8 +371,8 @@ NTSTATUS FILE_GetNtStatus(void) case EOPNOTSUPP:return STATUS_NOT_SUPPORTED; case ECONNRESET:return STATUS_PIPE_DISCONNECTED; case EFAULT: return STATUS_ACCESS_VIOLATION; + case ESPIPE: return STATUS_ILLEGAL_FUNCTION; case ENOEXEC: /* ?? */ - case ESPIPE: /* ?? */ case EEXIST: /* ?? */ default: FIXME( "Converting errno %d to STATUS_UNSUCCESSFUL\n", err );

1 0

Paul Vriens : msi/tests: Remove test directory after the files have been deleted.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 4d0232e504a5c7c9d347d219a92a9cee1728efb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0232e504a5c7c9d347d219a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Dec 31 15:19:35 2006 +0100 msi/tests: Remove test directory after the files have been deleted. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index d044436..1c0fb6a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -872,13 +872,13 @@ static void test_continuouscabs(void) r = MsiInstallProductA(msifile, NULL); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); todo_wine { ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); } + ok(delete_pf("msitest", FALSE), "File not installed\n"); delete_cab_files(); DeleteFile(msifile);

1 0

Paul Vriens : kernel32/tests: Run tests on NT4 again.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: bafefecaa21725c59fdd5d744c27eafc8c24ac60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafefecaa21725c59fdd5d744… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Dec 30 20:19:24 2006 +0100 kernel32/tests: Run tests on NT4 again. --- dlls/kernel32/tests/thread.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 42e649b..9e873c4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -472,15 +472,17 @@ static VOID test_thread_priority(void) todo_wine ok(rc!=0,"error=%d\n",GetLastError()); + if (pOpenThread) { /* check that access control is obeyed */ - access_thread=pOpenThread(THREAD_ALL_ACCESS & - (~THREAD_QUERY_INFORMATION) & (~THREAD_SET_INFORMATION), - 0,curthreadId); - ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); - if (access_thread!=NULL) { - obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); - obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); - ok(CloseHandle(access_thread),"Error Closing thread handle\n"); + access_thread=pOpenThread(THREAD_ALL_ACCESS & + (~THREAD_QUERY_INFORMATION) & (~THREAD_SET_INFORMATION), + 0,curthreadId); + ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); + if (access_thread!=NULL) { + obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); + obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); + ok(CloseHandle(access_thread),"Error Closing thread handle\n"); + } } todo_wine {

1 0

Paul Vriens : kernel32/tests: Moved ok-statement to the appropriate place.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 85b52e5693c5ee6508c06bcbc14f67e091aeb7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b52e5693c5ee6508c06bcbc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Dec 30 20:19:07 2006 +0100 kernel32/tests: Moved ok-statement to the appropriate place. --- dlls/kernel32/tests/thread.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b51bb57..42e649b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -469,6 +469,9 @@ static VOID test_thread_priority(void) if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) return; /* WinME */ + todo_wine + ok(rc!=0,"error=%d\n",GetLastError()); + /* check that access control is obeyed */ access_thread=pOpenThread(THREAD_ALL_ACCESS & (~THREAD_QUERY_INFORMATION) & (~THREAD_SET_INFORMATION), @@ -481,8 +484,6 @@ static VOID test_thread_priority(void) } todo_wine { - ok(rc!=0,"error=%d\n",GetLastError()); - rc = pSetThreadPriorityBoost(curthread,1); ok( rc != 0, "error=%d\n",GetLastError()); rc=pGetThreadPriorityBoost(curthread,&disabled);

1 0

Paul Vriens : kernel32/tests: Move USE_EXTENDED_PRIORITIES outside the if-statement.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 83f071cf7b3bca1e3814c101d766222a620efce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f071cf7b3bca1e3814c101d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Dec 30 20:18:58 2006 +0100 kernel32/tests: Move USE_EXTENDED_PRIORITIES outside the if-statement. --- dlls/kernel32/tests/thread.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 763d9e6..b51bb57 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -440,10 +440,10 @@ static VOID test_thread_priority(void) obey_ar(GetExitCodeThread(access_thread,&exitCode)==0); ok(CloseHandle(access_thread),"Error Closing thread handle\n"); } + } #if USE_EXTENDED_PRIORITIES - min_priority=-7; max_priority=6; + min_priority=-7; max_priority=6; #endif - } for(i=min_priority;i<=max_priority;i++) { ok(SetThreadPriority(curthread,i)!=0, "SetThreadPriority Failed for priority: %d\n",i);

1 0

Paul Vriens : winspool.drv/tests: Skip EnumPrintersW tests when not implemented.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: f5ecb721274f58e8341a4edead9602abbe716893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ecb721274f58e8341a4edea… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Dec 30 18:13:08 2006 +0100 winspool.drv/tests: Skip EnumPrintersW tests when not implemented. --- dlls/winspool.drv/tests/info.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index c7f6634..3bf59aa 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1670,6 +1670,13 @@ static void test_EnumPrinters(void) SetLastError(0xdeadbeef); neededW = -1; ret = EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededW, &num); + /* EnumPrintersW is not supported on all platforms */ + if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + trace("EnumPrintersW is not implemented, skipping some tests\n"); + return; + } + if (!ret) { /* We have 1 or more printers */

1 0

Dmitry Timoshkov : winex11.drv: Fix the regression caused by a previous change.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 0995a6ea434cd9e1a4f8c7ea3fba54f1ff0f2794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0995a6ea434cd9e1a4f8c7ea3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Dec 30 22:03:36 2006 +0800 winex11.drv: Fix the regression caused by a previous change. --- dlls/winex11.drv/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 3c41b65..317500d 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -623,6 +623,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c /* fall through */ case SW_SHOWNORMAL: /* same as SW_NORMAL: */ case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ + if (!wasVisible) swp |= SWP_SHOWWINDOW; if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { swp |= SWP_FRAMECHANGED; @@ -630,7 +631,6 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c } else { - if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER;

1 0

Dmitry Timoshkov : user32: Update the ShowWindow test to pass cleanly under Windows 2000.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: bc2a0ca50f9ac818ffe9579f4b541e72bc8db997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2a0ca50f9ac818ffe9579f4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Dec 30 22:03:03 2006 +0800 user32: Update the ShowWindow test to pass cleanly under Windows 2000. --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 77e223b..601d967 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8338,9 +8338,9 @@ static const struct message WmShowNormal static const struct message WmShow[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -8378,12 +8378,13 @@ static const struct message WmShowNA_2[] static const struct message WmRestore_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, + { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } }; static const struct message WmRestore_2[] = { @@ -8424,12 +8425,13 @@ static const struct message WmHide_1[] = { WM_SHOWWINDOW, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } }; static const struct message WmHide_2[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGING, sent /*|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE*/ }, /* win2000 doesn't add SWP_NOACTIVATE */ + { WM_WINDOWPOSCHANGED, sent /*|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, /* win2000 doesn't add SWP_NOACTIVATE */ { 0 } }; static const struct message WmHide_3[] = { @@ -8442,8 +8444,8 @@ static const struct message WmHide_3[] = static const struct message WmShowMinimized_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINIMIZED }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MINIMIZED }, @@ -8451,7 +8453,7 @@ static const struct message WmShowMinimi }; static const struct message WmMinimize_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, - { HCBT_SETFOCUS, hook }, + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, @@ -8500,9 +8502,9 @@ static const struct message WmShowMaximi { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, @@ -8548,11 +8550,11 @@ static void test_ShowWindow(void) /* 2 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 3 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 4 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 5 */ { SW_SHOWMINIMIZED, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinimized_1, TRUE }, +/* 5 */ { SW_SHOWMINIMIZED, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinimized_1, FALSE }, /* 6 */ { SW_SHOWMINIMIZED, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_1, FALSE }, /* 7 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_1, FALSE }, /* 8 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, -/* 9 */ { SW_SHOWMAXIMIZED, FALSE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_1, TRUE }, +/* 9 */ { SW_SHOWMAXIMIZED, FALSE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_1, FALSE }, /* 10 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, /* 11 */ { SW_HIDE, TRUE, WS_MAXIMIZE, WmHide_1, FALSE }, /* 12 */ { SW_HIDE, FALSE, WS_MAXIMIZE, WmEmptySeq, FALSE }, @@ -8560,11 +8562,11 @@ static void test_ShowWindow(void) /* 14 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 15 */ { SW_HIDE, TRUE, 0, WmHide_2, FALSE }, /* 16 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, TRUE }, +/* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, FALSE }, /* 18 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, /* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, -/* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, TRUE }, +/* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 22 */ { SW_SHOWMINNOACTIVE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinNoActivate, TRUE }, /* 23 */ { SW_SHOWMINNOACTIVE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_4, FALSE }, /* 24 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, @@ -8573,7 +8575,7 @@ static void test_ShowWindow(void) /* 27 */ { SW_SHOWNA, TRUE, WS_VISIBLE|WS_MINIMIZE, WmShowNA_2, FALSE }, /* 28 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 29 */ { SW_HIDE, FALSE, WS_MINIMIZE, WmEmptySeq, FALSE }, -/* 30 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_1, TRUE }, +/* 30 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_1, FALSE }, /* 31 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, TRUE }, /* 32 */ { SW_HIDE, TRUE, 0, WmHide_3, TRUE }, /* 33 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, @@ -8598,7 +8600,7 @@ static void test_ShowWindow(void) /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, TRUE }, -/* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, TRUE }, +/* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 56 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_2, TRUE }, /* 57 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE } };

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007