July 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Fix selection and focus rectangles on reordered list (report mode).
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 6c0c08af02cfd4054073e683c3d7a1120bd990fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0c08af02cfd4054073e683c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 9 02:58:11 2009 +0400 comctl32/listview: Fix selection and focus rectangles on reordered list (report mode). --- dlls/comctl32/listview.c | 59 ++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd1d0d5..73781b2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4120,6 +4120,45 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (nSubItem && infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) nmlvcd.clrTextBk = CLR_NONE; + /* FIXME: temporary hack */ + rcSelect.left = rcLabel.left; + + /* draw the selection background, if we're drawing the main item */ + if (nSubItem == 0) + { + /* in icon mode, the label rect is really what we want to draw the + * background for */ + if (infoPtr->uView == LV_VIEW_ICON) + rcSelect = rcLabel; + + if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + { + /* we have to update left focus bound too if item isn't in leftmost column + and reduce right box bound */ + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + { + INT leftmost; + + if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) + { + INT Originx = pos.x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; + INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + + rcBox.right = LISTVIEW_GetColumnInfo(infoPtr, index)->rcHeader.right + Originx; + rcSelect.left = LISTVIEW_GetColumnInfo(infoPtr, leftmost)->rcHeader.left + Originx; + } + } + + rcSelect.right = rcBox.right; + } + + if (nmlvcd.clrTextBk != CLR_NONE) + ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + /* store new focus rectangle */ + if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; + } + /* state icons */ if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && (nSubItem == 0)) { @@ -4144,26 +4183,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS /* Don't bother painting item being edited */ if (infoPtr->hwndEdit && nItem == infoPtr->nEditLabelItem && nSubItem == 0) goto postpaint; - - /* FIXME: temporary hack */ - rcSelect.left = rcLabel.left; - - /* draw the selection background, if we're drawing the main item */ - if (nSubItem == 0) - { - /* in icon mode, the label rect is really what we want to draw the - * background for */ - if (infoPtr->uView == LV_VIEW_ICON) - rcSelect = rcLabel; - - if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - rcSelect.right = rcBox.right; - - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, 0, 0, 0); - /* store new focus rectangle */ - if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; - } /* figure out the text drawing flags */ uFormat = (infoPtr->uView == LV_VIEW_ICON ? (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS);

1 0

Rein Klazes : comdlg32: Fix a problem with resizing a customized file dialog.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: a73175fd11f398184deb316bde1daac9ec682e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73175fd11f398184deb316bd… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 9 09:36:04 2009 +0200 comdlg32: Fix a problem with resizing a customized file dialog. --- dlls/comdlg32/filedlg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index eb92c0d..faed51a 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1117,9 +1117,6 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) if(fodInfos->DlgInfos.hwndCustomDlg && (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) { - GetClientRect(hwnd, &rc); - DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, - 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); for( ctrl = GetWindow( fodInfos->DlgInfos.hwndCustomDlg, GW_CHILD); ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) { @@ -1142,6 +1139,11 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); } } + /* size the custom dialog at the end: some applications do some + * control re-arranging at this point */ + GetClientRect(hwnd, &rc); + DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, + 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); } EndDeferWindowPos( hdwp); /* should not be needed */

1 0

Francois Gouget : urlmon/tests: Fix two ok() trailing '\n's.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: a4f4fd2a77371a8f99e30a92aa3623db5e6733b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f4fd2a77371a8f99e30a92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:51:58 2009 +0200 urlmon/tests: Fix two ok() trailing '\n's. --- dlls/urlmon/tests/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 07d409e..a6fb6bb 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -294,12 +294,12 @@ static void test_CoInternetCreateZoneManager(void) return; hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IUnknown, (void **) &punk); - ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)\n", hr, punk); if (punk) IUnknown_Release(punk); hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManager, (void **) &punk); - ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)\n", hr, punk); if (punk) IUnknown_Release(punk);

1 0

Hwang YunSong : crypt32: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 755abeda015e14314348a52af3064bee02308429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755abeda015e14314348a52af… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:04:31 2009 +0900 crypt32: Updated Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 1a05353..0d83815 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -175,6 +175,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "�߰� �� " IDS_LOCALIZEDNAME_ADDRESSBOOK "�ٸ� ��" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "�ŷ�� ִ� ��" + IDS_LOCALIZEDNAME_DISALLOWED "�ŷ� �� " } STRINGTABLE DISCARDABLE

1 0

Hwang YunSong : cryptdlg: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 246c99916d73028709d7f4da876cc71f4554e8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246c99916d73028709d7f4da8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:08:31 2009 +0900 cryptdlg: Updated Korean resource. --- dlls/cryptdlg/cryptdlg_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc index 548a74d..e9a6d9d 100644 --- a/dlls/cryptdlg/cryptdlg_Ko.rc +++ b/dlls/cryptdlg/cryptdlg_Ko.rc @@ -29,7 +29,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "��å �ĺ��: " IDS_POLICY_QUALIFIER_INFO "��å �� " IDS_POLICY_QUALIFIER_ID "��å �� ̵�=" - IDS_CPS "CPS" + IDS_CPS "CPS"/*�� */ IDS_USER_NOTICE "�� " IDS_QUALIFIER "��" IDS_NOTICE_REF "�� "

1 0

Hwang YunSong : cryptui: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 7cecc0cb8255ff9f0492599900e368e31869dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cecc0cb8255ff9f049259990… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:12:45 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 6cbf6fe..2533a4e 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -404,22 +404,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� :", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-��ȣȭ�� X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-��ȣȭ�� X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��ȣ �޽�� ǥ��/PKCS #7 �޽��(&C) (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "�� ο� �ִ� �� (&I)", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "�� ȯ(&P)/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "�� ο� �ִ� �� (&U)", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "�� ȣȭ ��(&E)", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "��Ⱑ ��ϸ� �� Ű ��(&K)", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END

1 0

Hwang YunSong : notepad: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 3ce23c9802fe1a201e5c449acfca93db1766e92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce23c9802fe1a201e5c449ac… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:17:03 2009 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index b838cbf..56167de 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -114,12 +114,22 @@ STRING_TOOLARGE, "%s �ٸ� ��⸦ ��Ͻʽÿ�." STRING_NOTEXT, "�Է�� ϴ�.\ \n�� Է�� õ��Ͻʽÿ�" -STRING_DOESNOTEXIST, "%s\n�� ϴ�.\n\n \ +STRING_DOESNOTEXIST, "%s\ �� ϴ�.\n\n \ �� ðڽ��ϱ�?" -STRING_NOTSAVED, "%s\n�� Ǿ��ϴ�.\n\n \ +STRING_NOTSAVED, "%s\ �� Ǿ��ϴ�.\n\n \ �� Ͻðڽ��ϱ�?" STRING_NOTFOUND, "%s ��ڿ�� ã�� ϴ�." STRING_OUT_OF_MEMORY, "�� ۾�� Ϸ��ϴ� �� ʿ�� ޸𸮰� ��մϴ�.\ -\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�.\n" +\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�." + +STRING_UNICODE_LE, "��ڵ� (UTF-16)" +STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ�� \n\ +�� ϸ� �� ս�� Դϴ�.\n\ +�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ� \n\ +�ɼ� �� ϳ�� Ͻʽÿ�t.\n\ +��Ͻðڽ��ϱ�?" }

1 0

Austin English : notepad: Fix English resource line breaks.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: b0f53e1920e33ca970d29b47f6419a95c2ff9a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f53e1920e33ca970d29b47f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 8 01:10:40 2009 -0500 notepad: Fix English resource line breaks. --- programs/notepad/En.rc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index fb774cf..15439b1 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -120,14 +120,13 @@ STRING_TOOLARGE, "File '%s' is too large for note Please use a different editor." STRING_NOTEXT, "You didn't enter any text. \ \nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s' does not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s' has been modified\n\n \ Would you like to save the changes ?" STRING_NOTFOUND, "'%s' could not be found." STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ -task.\nClose one or more applications to increase the amount of\nfree \ -memory." +task.\nClose one or more applications to increase the amount of free memory." STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)"

1 0

Henri Verbeet : wined3d: Fix a sign compare warning in shader_vaddline().
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 6211643bf540209869b711c582e31b33715aae92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6211643bf540209869b711c58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:29 2009 +0200 wined3d: Fix a sign compare warning in shader_vaddline(). --- dlls/wined3d/baseshader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4e3fb92..e67e7ed 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -159,9 +159,8 @@ int shader_vaddline(SHADER_BUFFER* buffer, const char *format, va_list args) rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args); - if (rc < 0 || /* C89 */ - rc > SHADER_PGMSIZE - 1 - buffer->bsize) { /* C99 */ - + if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->bsize /* C99 */) + { ERR("The buffer allocated for the shader program string " "is too small at %d bytes.\n", SHADER_PGMSIZE); buffer->bsize = SHADER_PGMSIZE - 1;

1 0

Paul Vriens : comctl32/tests: Fix test failures with comctl32 <= 5.80.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: f88d9ab195c810d504a77c66fdd408fe1a601359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88d9ab195c810d504a77c66f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 8 11:57:23 2009 +0200 comctl32/tests: Fix test failures with comctl32 <= 5.80. --- dlls/comctl32/tests/datetime.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8fdbbe5..038a789 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -423,10 +423,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt); ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); todo_wine { - expect_systime(&st[0], &getSt[0]); - } - todo_wine { - expect_systime(&st[1], &getSt[1]); + ok(compare_systime(&st[0], &getSt[0]) == 1 || + broken(compare_systime(&st[0], &getSt[1]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); + + ok(compare_systime(&st[1], &getSt[1]) == 1 || + broken(compare_systime(&st[1], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); } fill_systime_struct(&st[0], 1980, 1, 3, 23, 14, 34, 37, 465); @@ -439,7 +442,9 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) and doing DTM_SETSYSTEMTIME */ expect_systime_date(&st[0], &getSt[0]); todo_wine { - expect_systime_time(&origSt, &getSt[0]); + ok(compare_systime_time(&origSt, &getSt[0]) == 1 || + broken(compare_systime_time(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1.time != ST2.time\n"); } /* set st[0] to value higher than minimum */ @@ -455,10 +460,13 @@ static void test_dtm_set_range_swap_min_max(HWND hWndDateTime) r = SendMessage(hWndDateTime, DTM_GETRANGE, 0, (LPARAM)getSt); ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); todo_wine { - expect_systime(&st[0], &getSt[1]); - } - todo_wine { - expect_systime(&st[1], &getSt[0]); + ok(compare_systime(&st[0], &getSt[1]) == 1 || + broken(compare_systime(&st[0], &getSt[0]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); + + ok(compare_systime(&st[1], &getSt[0]) == 1 || + broken(compare_systime(&st[1], &getSt[1]) == 1), /* comctl32 version <= 5.80 */ + "ST1 != ST2\n"); } /* set st[0] to value higher than st[1] */

1 0