January 2009 - Wine-commits

Dylan Smith : richedit: Added test for scroll position after EM_SETTEXTEX.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 9b7825f6f66fd8264d8c0600fab95c540ae0dec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7825f6f66fd8264d8c0600f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 21 10:09:58 2009 -0500 richedit: Added test for scroll position after EM_SETTEXTEX. --- dlls/riched20/tests/editor.c | 74 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index aa78e2a..244ab09 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3345,7 +3345,9 @@ static void test_EM_STREAMOUT(void) static void test_EM_SETTEXTEX(void) { - HWND hwndRichEdit = new_richedit(NULL); + HWND hwndRichEdit, parent; + SCROLLINFO si; + int sel_start, sel_end; SETTEXTEX setText; GETTEXTEX getText; WCHAR TestItem1[] = {'T', 'e', 's', 't', @@ -3392,6 +3394,76 @@ static void test_EM_SETTEXTEX(void) int result; CHARRANGE cr; EDITSTREAM es; + WNDCLASSA cls; + + /* Test the scroll position with and without a parent window. + * + * For some reason the scroll position is 0 after EM_SETTEXTEX + * with the ST_SELECTION flag only when the control has a parent + * window, even though the selection is at the end. */ + cls.style = 0; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "ParentTestClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindow(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok (parent != 0, "Failed to create parent window\n"); + + hwndRichEdit = CreateWindowEx(0, + RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_VSCROLL|WS_VISIBLE|WS_CHILD, + 0, 0, 200, 60, parent, NULL, + hmoduleRichEdit, NULL); + + setText.codepage = CP_ACP; + setText.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hwndRichEdit, SB_VERT, &si); + todo_wine ok(si.nPos == 0, "Position is incorrectly at %d\n", si.nPos); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 18, "Selection start incorrectly at %d\n", sel_start); + ok(sel_end == 18, "Selection end incorrectly at %d\n", sel_end); + + DestroyWindow(parent); + + /* Test without a parent window */ + hwndRichEdit = new_richedit(NULL); + setText.codepage = CP_ACP; + setText.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hwndRichEdit, SB_VERT, &si); + ok(si.nPos != 0, "Position is incorrectly at %d\n", si.nPos); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 18, "Selection start incorrectly at %d\n", sel_start); + ok(sel_end == 18, "Selection end incorrectly at %d\n", sel_end); + + /* The scroll position should also be 0 after EM_SETTEXTEX with ST_DEFAULT, + * but this time it is because the selection is at the beginning. */ + setText.codepage = CP_ACP; + setText.flags = ST_DEFAULT; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hwndRichEdit, SB_VERT, &si); + ok(si.nPos == 0, "Position is incorrectly at %d\n", si.nPos); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 0, "Selection start incorrectly at %d\n", sel_start); + ok(sel_end == 0, "Selection end incorrectly at %d\n", sel_end); setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */

1 0

Huw Davies : comdlg32: Simplify the preview change function a little.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 4126e8bfa5ff71c0e60c0f31f9cc971df26a4e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4126e8bfa5ff71c0e60c0f31f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 18:18:26 2009 +0000 comdlg32: Simplify the preview change function a little. --- dlls/comdlg32/printdlg.c | 72 +++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5f59f6c..d3add8d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3097,46 +3097,40 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pdw) { } /****************************************************************************************** - * PRINTDLG_PS_ChangePaperPrev - * - * Changes paper preview size / position + * pagesetup_change_preview * - * PARAMS: - * pda [i] Pointer for current PageSetupDataA structure + * Changes paper preview size / position * - * RETURNS: - * always - TRUE */ -static BOOL -PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda) +static void pagesetup_change_preview(const PageSetupDataA *data) { LONG width, height, x, y; - RECT rtTmp; - - if(pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) { - width = pda->rtDrawRect.right - pda->rtDrawRect.left; - height = pda->dlga->ptPaperSize.y * width / pda->dlga->ptPaperSize.x; - } else { - height = pda->rtDrawRect.bottom - pda->rtDrawRect.top; - width = pda->dlga->ptPaperSize.x * height / pda->dlga->ptPaperSize.y; - } - x = (pda->rtDrawRect.right + pda->rtDrawRect.left - width) / 2; - y = (pda->rtDrawRect.bottom + pda->rtDrawRect.top - height) / 2; - TRACE("rtDrawRect(%d, %d, %d, %d) x=%d, y=%d, w=%d, h=%d\n", - pda->rtDrawRect.left, pda->rtDrawRect.top, pda->rtDrawRect.right, pda->rtDrawRect.bottom, - x, y, width, height); - -#define SHADOW 4 - MoveWindow(GetDlgItem(pda->hDlg, rct2), x+width, y+SHADOW, SHADOW, height, FALSE); - MoveWindow(GetDlgItem(pda->hDlg, rct3), x+SHADOW, y+height, width, SHADOW, FALSE); - MoveWindow(GetDlgItem(pda->hDlg, rct1), x, y, width, height, FALSE); - rtTmp = pda->rtDrawRect; - rtTmp.right += SHADOW; - rtTmp.bottom += SHADOW; -#undef SHADOW - - InvalidateRect(pda->hDlg, &rtTmp, TRUE); - return TRUE; + RECT tmp; + const int shadow = 4; + + if(pagesetup_get_orientation(data) == DMORIENT_LANDSCAPE) + { + width = data->rtDrawRect.right - data->rtDrawRect.left; + height = data->dlga->ptPaperSize.y * width / data->dlga->ptPaperSize.x; + } + else + { + height = data->rtDrawRect.bottom - data->rtDrawRect.top; + width = data->dlga->ptPaperSize.x * height / data->dlga->ptPaperSize.y; + } + x = (data->rtDrawRect.right + data->rtDrawRect.left - width) / 2; + y = (data->rtDrawRect.bottom + data->rtDrawRect.top - height) / 2; + TRACE("draw rect %s x=%d, y=%d, w=%d, h=%d\n", + wine_dbgstr_rect(&data->rtDrawRect), x, y, width, height); + + MoveWindow(GetDlgItem(data->hDlg, rct2), x + width, y + shadow, shadow, height, FALSE); + MoveWindow(GetDlgItem(data->hDlg, rct3), x + shadow, y + height, width, shadow, FALSE); + MoveWindow(GetDlgItem(data->hDlg, rct1), x, y, width, height, FALSE); + + tmp = data->rtDrawRect; + tmp.right += shadow; + tmp.bottom += shadow; + InvalidateRect(data->hDlg, &tmp, TRUE); } static inline LONG *element_from_margin_id(RECT *rc, WORD id) @@ -3261,7 +3255,7 @@ static void pagesetup_printer_properties(HWND hDlg, PageSetupDataA *data) pagesetup_update_orientation_buttons(hDlg, data); /* Changing paper preview */ - PRINTDLG_PS_ChangePaperPrev(data); + pagesetup_change_preview(data); /* Selecting paper in combo */ count = SendDlgItemMessageW(hDlg, cmb2, CB_GETCOUNT, 0, 0); @@ -3320,7 +3314,7 @@ PRINTDLG_PS_WMCommandA( pagesetup_update_papersize(pda); rotate_rect(&pda->dlga->rtMargin, (id == rad2)); update_margin_edits(hDlg, pda, 0); - PRINTDLG_PS_ChangePaperPrev(pda); + pagesetup_change_preview(pda); } break; case cmb1: /* Printer combo */ @@ -3341,7 +3335,7 @@ PRINTDLG_PS_WMCommandA( { pagesetup_set_papersize(pda, paperword); pagesetup_update_papersize(pda); - PRINTDLG_PS_ChangePaperPrev(pda); + pagesetup_change_preview(pda); } else FIXME("could not get dialog text for papersize cmbbox?\n"); } @@ -3731,7 +3725,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pagesetup_set_defaultsource(pda, DMBIN_FORMSOURCE); /* FIXME: This is the auto select bin. Is this correct? */ /* Drawing paper prev */ - PRINTDLG_PS_ChangePaperPrev(pda); + pagesetup_change_preview(pda); return TRUE; } else { pda = GetPropW(hDlg, pagesetupdlg_prop);

1 0

Huw Davies : comdlg32: Rewrite the 1000ths inch conversion function to use the is_metric helper.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 048b57d1024ed45117bec0b1cb1d6da72cb118da URL: http://source.winehq.org/git/wine.git/?a=commit;h=048b57d1024ed45117bec0b1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 18:13:51 2009 +0000 comdlg32: Rewrite the 1000ths inch conversion function to use the is_metric helper. --- dlls/comdlg32/printdlg.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5631632..5f59f6c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2450,6 +2450,14 @@ static inline LONG tenths_mm_to_size(PageSetupDataA *data, LONG size) return 10 * size * 100 / 254; } +static inline LONG thousandths_inch_to_size(PageSetupDataA *data, LONG size) +{ + if (is_metric(data)) + return size * 254 / 100; + else + return size; +} + static DWORD _c_10mm2size(PAGESETUPDLGW *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) @@ -2459,7 +2467,7 @@ _c_10mm2size(PAGESETUPDLGW *dlga,DWORD size) { static DWORD -_c_inch2size(PAGESETUPDLGA *dlga,DWORD size) { +_c_inch2size(PAGESETUPDLGW *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) return size; else @@ -3700,8 +3708,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) /* We fill them out enabled or not */ if (!(pda->dlga->Flags & PSD_MARGINS)) { - /* default is 1 inch */ - DWORD size = _c_inch2size(pda->dlga,1000); + /* default is 1 inch */ + LONG size = thousandths_inch_to_size(pda, 1000); pda->dlga->rtMargin.left = size; pda->dlga->rtMargin.top = size; pda->dlga->rtMargin.right = size; @@ -3793,7 +3801,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg,edt7,str); } else { /* default is 1 inch */ - DWORD size = _c_inch2size((LPPAGESETUPDLGA)pdw->dlgw,1000); + DWORD size = _c_inch2size(pdw->dlgw,1000); WCHAR str[20]; _c_size2strW(pdw,size,str); SetDlgItemTextW(hDlg,edt4,str);

1 0

Huw Davies : comdlg32: Rewrite the 10ths mm conversion function to use the is_metric helper.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 53149c5413cef77c853f378b737985c9728211b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53149c5413cef77c853f378b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 18:12:21 2009 +0000 comdlg32: Rewrite the 10ths mm conversion function to use the is_metric helper. --- dlls/comdlg32/printdlg.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 41d8e4a..5631632 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2442,8 +2442,16 @@ static inline BOOL is_metric(const PageSetupDataA *pda) return pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS; } +static inline LONG tenths_mm_to_size(PageSetupDataA *data, LONG size) +{ + if (is_metric(data)) + return 10 * size; + else + return 10 * size * 100 / 254; +} + static DWORD -_c_10mm2size(PAGESETUPDLGA *dlga,DWORD size) { +_c_10mm2size(PAGESETUPDLGW *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) return 10*size*100/254; return 10*size; @@ -2810,8 +2818,8 @@ static BOOL pagesetup_update_papersize(PageSetupDataA *pda) } /* this is _10ths_ of a millimeter */ - pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga, points[i].x); - pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga, points[i].y); + pda->dlga->ptPaperSize.x = tenths_mm_to_size(pda, points[i].x); + pda->dlga->ptPaperSize.y = tenths_mm_to_size(pda, points[i].y); if(pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) { @@ -2851,8 +2859,8 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pdw) { if (GetDlgItemTextW(hDlg,cmb2,papername,sizeof(papername)/sizeof(papername[0]))>0) { PRINTDLG_PaperSizeW(&(pdw->pdlg),papername,&(pdw->dlgw->ptPaperSize)); - pdw->dlgw->ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw,pdw->dlgw->ptPaperSize.x); - pdw->dlgw->ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw,pdw->dlgw->ptPaperSize.y); + pdw->dlgw->ptPaperSize.x = _c_10mm2size(pdw->dlgw,pdw->dlgw->ptPaperSize.x); + pdw->dlgw->ptPaperSize.y = _c_10mm2size(pdw->dlgw,pdw->dlgw->ptPaperSize.y); } else FIXME("could not get dialog text for papersize cmbbox?\n"); #define GETVAL(id,val) if (GetDlgItemTextW(hDlg,id,buf,sizeof(buf)/sizeof(buf[0]))>0) { val = _c_str2sizeW(pdw->dlgw,buf); } else { FIXME("could not get dlgitemtextw for %x\n",id); } @@ -3019,8 +3027,8 @@ static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw) GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR)); PRINTDLG_PaperSizeW(&pdw->pdlg, PaperName, &pdw->curdlg.ptPaperSize); - pdw->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw, pdw->curdlg.ptPaperSize.x); - pdw->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw, pdw->curdlg.ptPaperSize.y); + pdw->curdlg.ptPaperSize.x = _c_10mm2size(pdw->dlgw, pdw->curdlg.ptPaperSize.x); + pdw->curdlg.ptPaperSize.y = _c_10mm2size(pdw->dlgw, pdw->curdlg.ptPaperSize.y); if(IsDlgButtonChecked(hDlg, rad2)) { @@ -3998,8 +4006,8 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { setupdlg->hDevNames = pdlg.hDevNames; /* FIXME: Just return "A4" for now. */ PRINTDLG_PaperSizeW(&pdlg,a4,&setupdlg->ptPaperSize); - setupdlg->ptPaperSize.x=_c_10mm2size((LPPAGESETUPDLGA)setupdlg,setupdlg->ptPaperSize.x); - setupdlg->ptPaperSize.y=_c_10mm2size((LPPAGESETUPDLGA)setupdlg,setupdlg->ptPaperSize.y); + setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x); + setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y); return TRUE; } hDlgTmpl = PRINTDLG_GetPGSTemplateW(setupdlg);

1 0

Huw Davies : comdlg32: Move handling of the 'Properties' button to a separate function.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: bfa384504a01c43af269c701b4308b6971158eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa384504a01c43af269c701b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 21 18:10:50 2009 +0000 comdlg32: Move handling of the 'Properties' button to a separate function. --- dlls/comdlg32/printdlg.c | 93 ++++++++++++++++++++++++++------------------- 1 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 412c343..41d8e4a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3211,6 +3211,57 @@ static void pagesetup_update_orientation_buttons(HWND hDlg, const PageSetupDataA CheckRadioButton(hDlg, rad1, rad2, rad1); } +/**************************************************************************************** + * pagesetup_printer_properties + * + * Handle invocation of the 'Properties' button (not present in the default template). + */ +static void pagesetup_printer_properties(HWND hDlg, PageSetupDataA *data) +{ + HANDLE hprn; + LPWSTR devname; + DEVMODEW *dm; + LRESULT count; + int i; + + devname = pagesetup_get_devname(data); + + if (!OpenPrinterW(devname, &hprn, NULL)) + { + FIXME("Call to OpenPrinter did not succeed!\n"); + pagesetup_release_devname(data, devname); + return; + } + + dm = pagesetup_get_devmode(data); + DocumentPropertiesW(hDlg, hprn, devname, dm, dm, DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); + pagesetup_set_devmode(data, dm); + pagesetup_release_devmode(data, dm); + pagesetup_release_devname(data, devname); + ClosePrinter(hprn); + + /* Changing paper */ + pagesetup_update_papersize(data); + pagesetup_update_orientation_buttons(hDlg, data); + + /* Changing paper preview */ + PRINTDLG_PS_ChangePaperPrev(data); + + /* Selecting paper in combo */ + count = SendDlgItemMessageW(hDlg, cmb2, CB_GETCOUNT, 0, 0); + if(count != CB_ERR) + { + WORD paperword = pagesetup_get_papersize(data); + for(i = 0; i < count; i++) + { + if(SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, i, 0) == paperword) { + SendDlgItemMessageW(hDlg, cmb2, CB_SETCURSEL, i, 0); + break; + } + } + } +} + /******************************************************************************** * PRINTDLG_PS_WMCommandA * process WM_COMMAND message for PageSetupDlgA @@ -3287,45 +3338,9 @@ PRINTDLG_PS_WMCommandA( pagesetup_set_defaultsource(pda, source); } break; - case psh2: /* Printer Properties button */ - { - HANDLE hPrinter; - char PrinterName[256]; - DEVMODEA *dm; - LRESULT count; - int i; - - GetDlgItemTextA(hDlg, cmb1, PrinterName, 255); - if (!OpenPrinterA(PrinterName, &hPrinter, NULL)) { - FIXME("Call to OpenPrinter did not succeed!\n"); - break; - } - dm = GlobalLock(pda->dlga->hDevMode); - DocumentPropertiesA(hDlg, hPrinter, PrinterName, dm, dm, - DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); - GlobalUnlock(pda->dlga->hDevMode); - ClosePrinter(hPrinter); - /* Changing paper */ - pagesetup_update_papersize(pda); - pagesetup_update_orientation_buttons(hDlg, pda); - - /* Changing paper preview */ - PRINTDLG_PS_ChangePaperPrev(pda); - /* Selecting paper in combo */ - count = SendDlgItemMessageW(hDlg, cmb2, CB_GETCOUNT, 0, 0); - if(count != CB_ERR) - { - WORD paperword = pagesetup_get_papersize(pda); - for(i = 0; i < count; i++) - { - if(SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, i, 0) == paperword) { - SendDlgItemMessageW(hDlg, cmb2, CB_SETCURSEL, i, 0); - break; - } - } - } - break; - } + case psh2: /* Printer Properties button */ + pagesetup_printer_properties(hDlg, pda); + break; case edt4: case edt5: case edt6:

1 0

Alexandre Julliard : user32/tests: Don' t display window info for hooks that don't contain a window.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: e280bf6644cdc601ec711236e614206909ec6fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e280bf6644cdc601ec711236e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 22 13:12:09 2009 +0100 user32/tests: Don't display window info for hooks that don't contain a window. Ignore some more registered messages. Fix some other failures on Win2k. --- dlls/user32/tests/win.c | 93 ++++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 37 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 605d7c5..8ec8a61 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -78,7 +78,7 @@ static void flush_events( BOOL remove_messages ) { MSG msg; int diff = 200; - int min_timeout = 50; + int min_timeout = 100; DWORD time = GetTickCount() + diff; while (diff > 0) @@ -87,7 +87,7 @@ static void flush_events( BOOL remove_messages ) if (remove_messages) while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); - min_timeout = 10; + min_timeout = 50; } } @@ -853,10 +853,17 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) trace("CBT: %d (%s), %08lx, %08lx\n", nCode, code_name, wParam, lParam); - /* on HCBT_DESTROYWND window state is undefined */ - if (nCode != HCBT_DESTROYWND && IsWindow((HWND)wParam)) + switch (nCode) { - if (pGetWindowInfo) + /* on HCBT_DESTROYWND window state is undefined */ + case HCBT_DESTROYWND: + break; + case HCBT_MOVESIZE: + case HCBT_MINMAX: + case HCBT_CREATEWND: + case HCBT_ACTIVATE: + case HCBT_SETFOCUS: + if (pGetWindowInfo && IsWindow((HWND)wParam)) { WINDOWINFO info; @@ -868,6 +875,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) ok(pGetWindowInfo((HWND)wParam, &info), "GetWindowInfo should not fail\n"); verify_window_info((HWND)wParam, &info); } + break; } switch (nCode) @@ -2662,6 +2670,24 @@ static void test_keyboard_input(HWND hwnd) ok( !ret, "message %04x available\n", msg.message); } +static BOOL wait_for_message( MSG *msg ) +{ + BOOL ret; + + for (;;) + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + if (ret) + { + if (msg->message == WM_PAINT) DispatchMessage(msg); + else if (msg->message < 0xc000) break; /* skip registered messages */ + } + else if (MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + } + if (!ret) msg->message = 0; + return ret; +} + static void test_mouse_input(HWND hwnd) { RECT rc; @@ -2674,6 +2700,7 @@ static void test_mouse_input(HWND hwnd) ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); + SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); GetWindowRect(hwnd, &rc); trace("main window %p: (%d,%d)-(%d,%d)\n", hwnd, rc.left, rc.top, rc.right, rc.bottom); @@ -2684,6 +2711,7 @@ static void test_mouse_input(HWND hwnd) assert(popup != 0); ShowWindow(popup, SW_SHOW); UpdateWindow(popup); + SetWindowPos( popup, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); GetWindowRect(popup, &rc); trace("popup window %p: (%d,%d)-(%d,%d)\n", popup, rc.left, rc.top, rc.right, rc.bottom); @@ -2720,6 +2748,7 @@ static void test_mouse_input(HWND hwnd) msg.message = 0; mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); + flush_events( FALSE ); /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { @@ -2732,17 +2761,14 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0); ShowWindow(popup, SW_HIDE); - do - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - while (msg.message >= 0xc000); /* skip registered messages */ - ok(msg.hwnd == hwnd && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ret = wait_for_message( &msg ); + if (ret) + ok(msg.hwnd == hwnd && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); flush_events( TRUE ); mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); ShowWindow(hwnd, SW_HIDE); - do - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - while (ret && msg.message >= 0xc000); /* skip registered messages */ + ret = wait_for_message( &msg ); ok( !ret, "message %04x available\n", msg.message); flush_events( TRUE ); @@ -2758,31 +2784,23 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", - msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", - msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n", - msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", - msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); @@ -2797,10 +2815,12 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, hwnd, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, hwnd, msg.message); @@ -2808,9 +2828,8 @@ static void test_mouse_input(HWND hwnd) SendMessageA(hwnd, WM_COMMAND, (WPARAM)popup, 0); test_lbuttondown_flag = FALSE; - do - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - while (msg.message >= 0xc000); /* skip registered messages */ + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); @@ -4892,8 +4911,8 @@ static void test_hwnd_message(void) ok(parent != desktop, "GetAncestor(GA_PARENT) should not return desktop for message windows\n"); root = pGetAncestor(hwnd, GA_ROOT); ok(root == hwnd, "GetAncestor(GA_ROOT) should return hwnd for message windows\n"); - ok( !pGetAncestor(parent, GA_PARENT), "parent shouldn't have parent %p\n", - pGetAncestor(parent, GA_PARENT) ); + ok( !pGetAncestor(parent, GA_PARENT) || broken(pGetAncestor(parent, GA_PARENT) != 0), /* win2k */ + "parent shouldn't have parent %p\n", pGetAncestor(parent, GA_PARENT) ); trace("parent %p root %p desktop %p\n", parent, root, desktop); if (!GetClassNameA( parent, buffer, sizeof(buffer) )) buffer[0] = 0; ok( !lstrcmpi( buffer, "Message" ), "wrong parent class '%s'\n", buffer ); @@ -5521,7 +5540,7 @@ START_TEST(win) if (!RegisterWindowClasses()) assert(0); hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); - assert(hhook); + if (!hhook) win_skip( "Cannot set CBT hook, skipping some tests\n" ); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -5588,7 +5607,7 @@ START_TEST(win) test_handles( hwndMain ); /* add the tests above this line */ - UnhookWindowsHookEx(hhook); + if (hhook) UnhookWindowsHookEx(hhook); DestroyWindow(hwndMain2); DestroyWindow(hwndMain);

1 0

Henri Verbeet : ddraw: Get rid of ddcomimpl.h.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: b09b0fbf95f6e12c3dfe2fbe6e83e82d6875b47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09b0fbf95f6e12c3dfe2fbe6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 22 10:33:37 2009 +0100 ddraw: Get rid of ddcomimpl.h. --- dlls/ddraw/ddcomimpl.h | 28 -- dlls/ddraw/ddraw_private.h | 7 +- dlls/ddraw/ddraw_thunks.c | 598 +++++++++---------------------------------- dlls/ddraw/device.c | 19 +- dlls/ddraw/direct3d.c | 16 +- dlls/ddraw/material.c | 43 ++-- dlls/ddraw/surface.c | 2 +- dlls/ddraw/surface_thunks.c | 18 +- dlls/ddraw/texture.c | 12 +- 9 files changed, 178 insertions(+), 565 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b09b0fbf95f6e12c3dfe2…

1 0

Henri Verbeet : ddraw: Get rid of CONVERT and CONVERT_REV.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: c0e72b055611228d0ccc46c1b893363e6418ac55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e72b055611228d0ccc46c1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 22 10:33:37 2009 +0100 ddraw: Get rid of CONVERT and CONVERT_REV. --- dlls/ddraw/surface_thunks.c | 114 ++++++++++++++++++++---------------------- 1 files changed, 54 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0e72b055611228d0ccc4…

1 0

Alexandre Julliard : user32/tests: Ignore WM_IME_SELECT message. Skip mouse hovering test if the mouse isn't where we want.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: d3078e0bacbfac3360c993287675b9acc44ae619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3078e0bacbfac3360c993287… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 22 13:11:38 2009 +0100 user32/tests: Ignore WM_IME_SELECT message. Skip mouse hovering test if the mouse isn't where we want. --- dlls/user32/tests/msg.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e8d5301..19c89ad 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6871,6 +6871,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_GETICON: case WM_GETOBJECT: case WM_DEVICECHANGE: + case WM_IME_SELECT: return 0; } @@ -9656,7 +9657,24 @@ static void test_TrackMouseEvent(void) flush_sequence(); track_hover(hwnd, 0); - track_query(TME_HOVER, hwnd, default_hover_time); + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + tme.hwndTrack = (HWND)0xdeadbeef; + tme.dwHoverTime = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(ret, "TrackMouseEvent(TME_QUERY) error %d\n", GetLastError()); + ok(tme.cbSize == sizeof(tme), "wrong tme.cbSize %u\n", tme.cbSize); + if (!tme.dwFlags) + { + skip( "Cursor not inside window, skipping TrackMouseEvent tests\n" ); + DestroyWindow( hwnd ); + return; + } + ok(tme.dwFlags == TME_HOVER, "wrong tme.dwFlags %08x, expected TME_HOVER\n", tme.dwFlags); + ok(tme.hwndTrack == hwnd, "wrong tme.hwndTrack %p, expected %p\n", tme.hwndTrack, hwnd); + ok(tme.dwHoverTime == default_hover_time, "wrong tme.dwHoverTime %u, expected %u\n", + tme.dwHoverTime, default_hover_time); pump_msg_loop_timeout(default_hover_time, FALSE); ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE);

1 0

Henri Verbeet : ddraw: Get rid of ICOM_OBJECT.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 802f9c7e29ed877f536328213504f5bdbeeb7205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802f9c7e29ed877f536328213… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 22 10:33:37 2009 +0100 ddraw: Get rid of ICOM_OBJECT. --- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddcomimpl.h | 5 -- dlls/ddraw/ddraw.c | 14 +++---- dlls/ddraw/ddraw_private.h | 71 ++++++++++++++++++++++++++++++++ dlls/ddraw/ddraw_thunks.c | 36 ++++------------- dlls/ddraw/device.c | 93 +++++++++++++++++------------------------- dlls/ddraw/direct3d.c | 22 +---------- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/material.c | 2 +- dlls/ddraw/surface.c | 26 ++++++------ dlls/ddraw/surface_thunks.c | 2 +- dlls/ddraw/texture.c | 25 +++--------- dlls/ddraw/vertexbuffer.c | 20 +++------ dlls/ddraw/viewport.c | 14 +++---- 15 files changed, 161 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=802f9c7e29ed877f53632…

1 0