February 2010 - Wine-commits

Dmitry Timoshkov : comctl32: Initialize item. mask before sending HDM_GETITEM message.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 27e9b5bdb420d497af92fb8e9c4a6727a6ea8351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e9b5bdb420d497af92fb8e9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 22 14:54:17 2010 +0800 comctl32: Initialize item.mask before sending HDM_GETITEM message. --- dlls/comctl32/tests/listview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0a147b6..b224192 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4312,8 +4312,11 @@ static void test_header_notification(void) ret = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); ok(ret == 1, "expected header item count 1, got %ld\n", ret); + memset(&item, 0, sizeof(item)); + item.mask = HDI_WIDTH; ret = SendMessage(header, HDM_GETITEMA, 0, (LPARAM)&item); ok(ret, "HDM_GETITEM failed\n"); + ok(item.cxy == 100, "expected 100, got %d\n", item.cxy); nmh.hdr.hwndFrom = header; nmh.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID);

1 0

Christian Costa : d3d8: Display FIXME only once in ValidatePixelShader and ValidateVertexShader.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 11a015070c986bd96d847587c56c869b27d6cbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a015070c986bd96d847587c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Feb 19 15:37:23 2010 +0100 d3d8: Display FIXME only once in ValidatePixelShader and ValidateVertexShader. --- dlls/d3d8/d3d8_main.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index e5f44e7..c471049 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -79,7 +79,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) { HRESULT ret; - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + static BOOL warned; + + if (TRACE_ON(d3d8) || !warned) { + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + warned = TRUE; + } if (!vertexshader) return E_FAIL; @@ -109,7 +114,12 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) { HRESULT ret; - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + static BOOL warned; + + if (TRACE_ON(d3d8) || !warned) { + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + warned = TRUE; + } if (!pixelshader) return E_FAIL;

1 0

Piotr Caban : oleaut32: Added MEMBERID_NIL handling to ICreateTypeInfo_LayOut.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: bf0815424b56636cc0ffb0023a2ee03e72744c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0815424b56636cc0ffb0023… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 22 01:58:39 2010 +0100 oleaut32: Added MEMBERID_NIL handling to ICreateTypeInfo_LayOut. --- dlls/oleaut32/tests/typelib.c | 4 ++++ dlls/oleaut32/typelib2.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2a04ae9..e75d320 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1041,6 +1041,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + funcdesc.memid = MEMBERID_NIL; + hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 6eb13af..e1a36b2 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1994,8 +1994,25 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( i = 0; This->typeinfo->cbSizeVft = 0; for(iter=This->typedata->next->next; iter!=This->typedata->next; iter=iter->next) { - if(iter->indice == MEMBERID_NIL) - FIXME("MEMBERID_NIL handling not yet implemented\n"); + /* Assign MEMBERID if MEMBERID_NIL was specified */ + if(iter->indice == MEMBERID_NIL) { + iter->indice = 0x60000000 + i; + + for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { + if(iter == iter2) continue; + if(iter2->indice == iter->indice) { + iter->indice = 0x5fffffff + This->typeinfo->cElement + i; + + for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { + if(iter == iter2) continue; + if(iter2->indice == iter->indice) + return E_ACCESSDENIED; + } + + break; + } + } + } typedata[i] = iter;

1 0

Dylan Smith : richedit: Added some extra tests for EM_FORMATRANGE.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: fe9933ae4d4d84910032b3ed393cbb8c66dc3eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9933ae4d4d84910032b3ed3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:17:49 2010 -0500 richedit: Added some extra tests for EM_FORMATRANGE. The existing tests were not properly testing the return value for the case where all the text fits in the page rect, so this patch adds a couple of simple tests for this case. --- dlls/riched20/tests/editor.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8aa1c39..1fbdaa5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4812,9 +4812,10 @@ static void test_WM_PASTE(void) static void test_EM_FORMATRANGE(void) { - int i, tpp_x, tpp_y; + int r, i, tpp_x, tpp_y; HDC hdc; HWND hwndRichEdit = new_richedit(NULL); + FORMATRANGE fr; static const struct { const char *string; /* The string */ int first; /* First 'pagebreak', 0 for don't care */ @@ -4834,14 +4835,29 @@ static void test_EM_FORMATRANGE(void) tpp_x = 1440 / GetDeviceCaps(hdc, LOGPIXELSX); tpp_y = 1440 / GetDeviceCaps(hdc, LOGPIXELSY); + /* Test the simple case where all the text fits in the page rect. */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"a"); + fr.hdc = fr.hdcTarget = hdc; + fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; + fr.rc.right = fr.rcPage.right = 500 * tpp_x; + fr.rc.bottom = fr.rcPage.bottom = 500 * tpp_y; + fr.chrg.cpMin = 0; + fr.chrg.cpMax = -1; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, FALSE, (LPARAM)&fr); + todo_wine ok(r == 2, "r=%d expected r=2\n", r); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"ab"); + fr.rc.bottom = fr.rcPage.bottom; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, FALSE, (LPARAM)&fr); + todo_wine ok(r == 3, "r=%d expected r=3\n", r); + SendMessage(hwndRichEdit, EM_FORMATRANGE, FALSE, 0); for (i = 0; i < sizeof(fmtstrings)/sizeof(fmtstrings[0]); i++) { - FORMATRANGE fr; GETTEXTLENGTHEX gtl; SIZE stringsize; - int r, len; + int len; SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) fmtstrings[i].string);

1 0

Dylan Smith : wordpad: Added missing calls to DeleteDC and ReleaseDC.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 7451facf2f7a9ee8e5873b6c6976bffea241199a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7451facf2f7a9ee8e5873b6c6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:17:59 2010 -0500 wordpad: Added missing calls to DeleteDC and ReleaseDC. --- programs/wordpad/print.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index e8d14e8..f4d4eef 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -412,6 +412,7 @@ void print_quick(HWND hMainWnd, LPWSTR wszFileName) pd.hDC = make_dc(); print(&pd, wszFileName); + DeleteDC(pd.hDC); } void dialog_print(HWND hMainWnd, LPWSTR wszFileName) @@ -596,6 +597,8 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); preview.pages = get_num_pages(hEditorWnd, fr); DeleteDC(fr.hdc); + DeleteDC(hdcTarget); + ReleaseDC(hWnd, hdc); update_preview_sizes(hWnd, TRUE); break; @@ -845,7 +848,7 @@ LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight) { HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); - HPEN hPen; + HPEN hPen, oldPen; int TopMargin = (int)((float)twips_to_pixels(lpFr->rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); int BottomMargin = (int)((float)twips_to_pixels(lpFr->rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); @@ -860,7 +863,7 @@ static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float r /* Draw margin lines */ hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); - SelectObject(*hdcSized, hPen); + oldPen = SelectObject(*hdcSized, hPen); MoveToEx(*hdcSized, 0, TopMargin, NULL); LineTo(*hdcSized, bmNewWidth, TopMargin); @@ -872,6 +875,8 @@ static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float r MoveToEx(*hdcSized, RightMargin, 0, NULL); LineTo(*hdcSized, RightMargin, bmNewHeight); + SelectObject(*hdcSized, oldPen); + DeleteObject(hPen); } static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int page)

1 0

Dylan Smith : wordpad: Get preview page character boundaries with number of pages.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: b2781015807bfedcdad24b9c52bc1c81dbcd95f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2781015807bfedcdad24b9c5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:18:06 2010 -0500 wordpad: Get preview page character boundaries with number of pages. Rather than making seperate calls to EM_FORMATRANGE to get the number of pages and the character boundaries, it would be easiest to get both together. The time to process EM_FORMATRANGE seems like it would take a lot longer than the time needed to cache the character page boundaries. --- programs/wordpad/print.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index f4d4eef..faf9439 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -28,6 +28,7 @@ typedef struct _previewinfo { int page; int pages; + int *pageEnds, pageCapacity; HDC hdc; HDC hdc2; HDC hdcSized; @@ -249,12 +250,30 @@ static int get_num_pages(HWND hEditorWnd, FORMATRANGE fr) int page = 0; fr.chrg.cpMin = 0; + if (!preview.pageEnds) + { + preview.pageCapacity = 32; + preview.pageEnds = HeapAlloc(GetProcessHeap(), 0, + sizeof(int) * preview.pageCapacity); + if (!preview.pageEnds) return 0; + } + do { int bottom = fr.rc.bottom; - page++; fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, (LPARAM)&fr); + if (page >= preview.pageCapacity) + { + int *new_buffer; + new_buffer = HeapReAlloc(GetProcessHeap(), 0, preview.pageEnds, + sizeof(int) * preview.pageCapacity * 2); + if (!new_buffer) return page; + preview.pageCapacity *= 2; + preview.pageEnds = new_buffer; + } + preview.pageEnds[page] = fr.chrg.cpMin; + page++; fr.rc.bottom = bottom; } while(fr.chrg.cpMin && fr.chrg.cpMin < fr.chrg.cpMax); @@ -696,6 +715,9 @@ void close_preview(HWND hMainWnd) preview.window.bottom = 0; preview.page = 0; preview.pages = 0; + HeapFree(GetProcessHeap(), 0, preview.pageEnds); + preview.pageEnds = NULL; + preview.pageCapacity = 0; preview_bar_show(hMainWnd, FALSE); DestroyWindow(hwndPreview); @@ -883,7 +905,7 @@ static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int pa { int bottom; - char_from_pagenum(hEditorWnd, lpFr, page); + lpFr->chrg.cpMin = page <= 1 ? 0 : preview.pageEnds[page-2]; FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); bottom = lpFr->rc.bottom; SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr);

1 0

Dylan Smith : wordpad: Use pages_shown variables to indicate pages shown.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: a75bf390d70e9b0667c1dd6ea6f7b2c792f600eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75bf390d70e9b0667c1dd6ea… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:18:11 2010 -0500 wordpad: Use pages_shown variables to indicate pages shown. Previously hdc2 needed to be deleted and set to NULL to indicate that only one page should be shown. I have avoided this using a new variable for the preview structure. The device context were also being deleted without deleting the bitmaps created for them and selected into them, so this patch also gets these bitmaps and deletes them with their device context. --- programs/wordpad/print.c | 72 +++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index faf9439..45c112e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -28,6 +28,7 @@ typedef struct _previewinfo { int page; int pages; + int pages_shown; int *pageEnds, pageCapacity; HDC hdc; HDC hdc2; @@ -519,10 +520,8 @@ static void update_preview_scrollbars(HWND hwndPreview, RECT *window) sbi.nPage = window->bottom; SetScrollInfo(hwndPreview, SB_VERT, &sbi, TRUE); } else { - if (!preview.hdc2) - sbi.nMax = preview.bmScaledSize.cx + min_spacing * 2; - else - sbi.nMax = preview.bmScaledSize.cx * 2 + min_spacing * 3; + sbi.nMax = preview.bmScaledSize.cx * preview.pages_shown + + min_spacing * (preview.pages_shown + 1); sbi.nPage = window->right; SetScrollInfo(hwndPreview, SB_HORZ, &sbi, TRUE); /* Change in the horizontal scrollbar visibility affects the @@ -550,10 +549,9 @@ static void update_preview_sizes(HWND hwndPreview, BOOL zoomLevelUpdated) } else { ratioHeight = (window.bottom - min_spacing * 2) / (float)preview.bmSize.cy; - if(preview.hdc2) - ratioWidth = ((window.right - min_spacing * 3) / 2.0) / (float)preview.bmSize.cx; - else - ratioWidth = (window.right - min_spacing * 2) / (float)preview.bmSize.cx; + ratioWidth = (float)(window.right - + min_spacing * (preview.pages_shown + 1)) / + (preview.pages_shown * preview.bmSize.cx); if(ratioWidth > ratioHeight) ratio = ratioHeight; @@ -571,10 +569,9 @@ static void update_preview_sizes(HWND hwndPreview, BOOL zoomLevelUpdated) preview.spacing.cy = max(min_spacing, (window.bottom - preview.bmScaledSize.cy) / 2); - if(!preview.hdc2) - preview.spacing.cx = (window.right - preview.bmScaledSize.cx) / 2; - else - preview.spacing.cx = (window.right - preview.bmScaledSize.cx * 2) / 3; + preview.spacing.cx = (window.right - + preview.bmScaledSize.cx * preview.pages_shown) / + (preview.pages_shown + 1); if (preview.spacing.cx < min_spacing) preview.spacing.cx = min_spacing; @@ -702,6 +699,7 @@ void init_preview(HWND hMainWnd, LPWSTR wszFileName) preview.zoomratio = 0; preview.zoomlevel = 0; preview_bar_show(hMainWnd, TRUE); + if (preview.pages_shown < 1) preview.pages_shown = 1; hwndPreview = CreateWindowExW(0, wszPreviewWndClass, NULL, WS_VISIBLE | WS_CHILD | WS_VSCROLL | WS_HSCROLL, @@ -919,9 +917,8 @@ static void update_preview_buttons(HWND hMainWnd) { HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_PREVPAGE), preview.page > 1); - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.hdc2 ? - (preview.page + 1) < preview.pages : - preview.page < preview.pages); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), + preview.page + preview.pages_shown - 1 < preview.pages); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), preview.pages > 1 && preview.zoomlevel == 0); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMIN), preview.zoomlevel < 2); EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0); @@ -953,15 +950,6 @@ LRESULT print_preview(HWND hwndPreview) HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); HBITMAP hBitmapCapture; - preview.hdc = CreateCompatibleDC(hdc); - - if(preview.hdc2) - { - if(preview.hdc2 != (HDC)-1) - DeleteDC(preview.hdc2); - preview.hdc2 = CreateCompatibleDC(hdc); - } - gt.flags = GTL_DEFAULT; gt.codepage = 1200; fr.chrg.cpMin = 0; @@ -972,16 +960,23 @@ LRESULT print_preview(HWND hwndPreview) paper.top = 0; paper.bottom = preview.bmSize.cy; - fr.hdc = preview.hdc; + fr.hdc = preview.hdc = CreateCompatibleDC(hdc); hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); SelectObject(fr.hdc, hBitmapCapture); draw_preview(hEditorWnd, &fr, &paper, preview.page); - if(preview.hdc2) + if(preview.pages_shown > 1) { + if (!preview.hdc2) + { + preview.hdc2 = CreateCompatibleDC(hdc); + hBitmapCapture = CreateCompatibleBitmap(hdc, + preview.bmSize.cx, + preview.bmSize.cy); + SelectObject(preview.hdc2, hBitmapCapture); + } + fr.hdc = preview.hdc2; - hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); - SelectObject(fr.hdc, hBitmapCapture); draw_preview(hEditorWnd, &fr, &fr.rcPage, preview.page + 1); } @@ -1000,7 +995,7 @@ LRESULT print_preview(HWND hwndPreview) FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); - if(preview.hdc2) + if(preview.pages_shown > 1) { background.left += preview.bmScaledSize.cx + preview.spacing.cx; background.right += preview.bmScaledSize.cx + preview.spacing.cx; @@ -1014,7 +1009,7 @@ LRESULT print_preview(HWND hwndPreview) preview.bmScaledSize.cx, preview.bmScaledSize.cy, preview.bmSize.cx, preview.bmSize.cy); - if(preview.hdc2) + if(preview.pages_shown > 1) { draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, preview.zoomratio, preview.bmScaledSize.cx, preview.bmScaledSize.cy, @@ -1026,7 +1021,7 @@ LRESULT print_preview(HWND hwndPreview) preview.bmScaledSize.cx, preview.bmScaledSize.cy, preview.hdcSized, 0, 0, SRCCOPY); - if(preview.hdc2) + if(preview.pages_shown > 1) { BitBlt(hdc, preview.spacing.cx * 2 + preview.bmScaledSize.cx - scrollpos.x, preview.spacing.cy - scrollpos.y, preview.bmScaledSize.cx, @@ -1056,18 +1051,17 @@ static void toggle_num_pages(HWND hMainWnd) WCHAR name[MAX_STRING_LEN]; HINSTANCE hInst = GetModuleHandleW(0); - if(preview.hdc2) - { - DeleteDC(preview.hdc2); - preview.hdc2 = 0; - } else + if(preview.pages_shown > 1) { + preview.pages_shown = 1; + } else { if(preview.page == preview.pages) preview.page--; - preview.hdc2 = (HDC)-1; + preview.pages_shown = 2; } - LoadStringW(hInst, preview.hdc2 ? STRING_PREVIEW_ONEPAGE : STRING_PREVIEW_TWOPAGES, + LoadStringW(hInst, preview.pages_shown > 1 ? STRING_PREVIEW_ONEPAGE : + STRING_PREVIEW_TWOPAGES, name, MAX_STRING_LEN); SetWindowTextW(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), name); @@ -1104,7 +1098,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) { preview.zoomlevel++; preview.zoomratio = 0; - if (preview.hdc2) + if (preview.pages_shown > 1) { /* Forced switch to one page when zooming in. */ toggle_num_pages(hWnd);

1 0

Dylan Smith : wordpad: Update bitmaps outside of WM_PAINT.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 7a9f72863df0820f484060ed98ba7225d6cb7f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9f72863df0820f484060ed9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 22 03:18:18 2010 -0500 wordpad: Update bitmaps outside of WM_PAINT. This avoids having to delete the device context and the bitmap selected into it just to update the bitmap, since it was setting preview.hdc to NULL to indicate that these bitmaps needed to be updated. This patch also helps make WM_PAINT messages get processed faster by moving this out of the code for handling WM_PAINT. --- programs/wordpad/print.c | 179 ++++++++++++++++++++++++++++------------------ 1 files changed, 110 insertions(+), 69 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 45c112e..0dfce24 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -578,21 +578,52 @@ static void update_preview_sizes(HWND hwndPreview, BOOL zoomLevelUpdated) update_preview_scrollbars(hwndPreview, &window); } +static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight); + /* Update for zoom ratio changes with same page. */ static void update_scaled_preview(HWND hMainWnd) { - HWND hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); - preview.window.right = 0; + FORMATRANGE fr; + HWND hwndPreview; + + /* This may occur on WM_CREATE before update_preview is called + * because a WM_SIZE message is generated from updating the + * scrollbars. */ + if (!preview.hdc) return; + + hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); + fr.hdcTarget = make_dc(); + fr.rc = fr.rcPage = preview.rcPage; + fr.rc.left += margins.left; + fr.rc.top += margins.top; + fr.rc.bottom -= margins.bottom; + fr.rc.right -= margins.right; + + draw_preview_page(preview.hdc, &preview.hdcSized, &fr, preview.zoomratio, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.bmSize.cx, preview.bmSize.cy); + + if(preview.pages_shown > 1) + { + draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, preview.zoomratio, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.bmSize.cx, preview.bmSize.cy); + } + InvalidateRect(hwndPreview, NULL, TRUE); + DeleteDC(fr.hdcTarget); } +static void update_preview(HWND hMainWnd); + LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { case WM_CREATE: { - HWND hEditorWnd = GetDlgItem(GetParent(hWnd), IDC_EDITOR); + HWND hMainWnd = GetParent(hWnd); + HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); FORMATRANGE fr; GETTEXTLENGTHEX gt = {GTL_DEFAULT, 1200}; HDC hdc = GetDC(hWnd); @@ -617,6 +648,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) ReleaseDC(hWnd, hdc); update_preview_sizes(hWnd, TRUE); + update_preview(hMainWnd); break; } @@ -716,6 +748,30 @@ void close_preview(HWND hMainWnd) HeapFree(GetProcessHeap(), 0, preview.pageEnds); preview.pageEnds = NULL; preview.pageCapacity = 0; + if(preview.hdc) { + HBITMAP oldbm = GetCurrentObject(preview.hdc, OBJ_BITMAP); + DeleteDC(preview.hdc); + DeleteObject(oldbm); + preview.hdc = NULL; + } + if(preview.hdc2) { + HBITMAP oldbm = GetCurrentObject(preview.hdc2, OBJ_BITMAP); + DeleteDC(preview.hdc2); + DeleteObject(oldbm); + preview.hdc2 = NULL; + } + if(preview.hdcSized) { + HBITMAP oldbm = GetCurrentObject(preview.hdcSized, OBJ_BITMAP); + DeleteDC(preview.hdcSized); + DeleteObject(oldbm); + preview.hdcSized = NULL; + } + if(preview.hdcSized2) { + HBITMAP oldbm = GetCurrentObject(preview.hdcSized2, OBJ_BITMAP); + DeleteDC(preview.hdcSized2); + DeleteObject(oldbm); + preview.hdcSized2 = NULL; + } preview_bar_show(hMainWnd, FALSE); DestroyWindow(hwndPreview); @@ -926,63 +982,14 @@ static void update_preview_buttons(HWND hMainWnd) LRESULT print_preview(HWND hwndPreview) { - FORMATRANGE fr; HDC hdc; RECT window, background; PAINTSTRUCT ps; - HWND hMainWnd = GetParent(hwndPreview); POINT scrollpos; hdc = BeginPaint(hwndPreview, &ps); GetClientRect(hwndPreview, &window); - fr.hdcTarget = make_dc(); - fr.rc = fr.rcPage = preview.rcPage; - fr.rc.left += margins.left; - fr.rc.top += margins.top; - fr.rc.bottom -= margins.bottom; - fr.rc.right -= margins.right; - - if(!preview.hdc) - { - GETTEXTLENGTHEX gt; - RECT paper; - HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); - HBITMAP hBitmapCapture; - - gt.flags = GTL_DEFAULT; - gt.codepage = 1200; - fr.chrg.cpMin = 0; - fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); - - paper.left = 0; - paper.right = preview.bmSize.cx; - paper.top = 0; - paper.bottom = preview.bmSize.cy; - - fr.hdc = preview.hdc = CreateCompatibleDC(hdc); - hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); - SelectObject(fr.hdc, hBitmapCapture); - draw_preview(hEditorWnd, &fr, &paper, preview.page); - - if(preview.pages_shown > 1) - { - if (!preview.hdc2) - { - preview.hdc2 = CreateCompatibleDC(hdc); - hBitmapCapture = CreateCompatibleBitmap(hdc, - preview.bmSize.cx, - preview.bmSize.cy); - SelectObject(preview.hdc2, hBitmapCapture); - } - - fr.hdc = preview.hdc2; - draw_preview(hEditorWnd, &fr, &fr.rcPage, preview.page + 1); - } - - update_preview_buttons(hMainWnd); - } - FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); scrollpos.x = GetScrollPos(hwndPreview, SB_HORZ); @@ -1003,20 +1010,6 @@ LRESULT print_preview(HWND hwndPreview) FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); } - if(window.right != preview.window.right || window.bottom != preview.window.bottom) - { - draw_preview_page(preview.hdc, &preview.hdcSized, &fr, preview.zoomratio, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.bmSize.cx, preview.bmSize.cy); - - if(preview.pages_shown > 1) - { - draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, preview.zoomratio, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.bmSize.cx, preview.bmSize.cy); - } - } - BitBlt(hdc, preview.spacing.cx - scrollpos.x, preview.spacing.cy - scrollpos.y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, preview.hdcSized, 0, 0, SRCCOPY); @@ -1028,7 +1021,6 @@ LRESULT print_preview(HWND hwndPreview) preview.bmScaledSize.cy, preview.hdcSized2, 0, 0, SRCCOPY); } - DeleteDC(fr.hdcTarget); preview.window = window; EndPaint(hwndPreview, &ps); @@ -1039,10 +1031,59 @@ LRESULT print_preview(HWND hwndPreview) /* Update for page changes. */ static void update_preview(HWND hMainWnd) { - DeleteDC(preview.hdc); - preview.hdc = 0; + GETTEXTLENGTHEX gt; + RECT paper; + HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); + HWND hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); + HBITMAP hBitmapCapture; + FORMATRANGE fr; + HDC hdc = GetDC(hwndPreview); + + fr.hdcTarget = make_dc(); + fr.rc = fr.rcPage = preview.rcPage; + fr.rc.left += margins.left; + fr.rc.top += margins.top; + fr.rc.bottom -= margins.bottom; + fr.rc.right -= margins.right; + + gt.flags = GTL_DEFAULT; + gt.codepage = 1200; + fr.chrg.cpMin = 0; + fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); + + paper.left = 0; + paper.right = preview.bmSize.cx; + paper.top = 0; + paper.bottom = preview.bmSize.cy; + + if (!preview.hdc) { + preview.hdc = CreateCompatibleDC(hdc); + hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy); + SelectObject(preview.hdc, hBitmapCapture); + } + + fr.hdc = preview.hdc; + draw_preview(hEditorWnd, &fr, &paper, preview.page); + + if(preview.pages_shown > 1) + { + if (!preview.hdc2) + { + preview.hdc2 = CreateCompatibleDC(hdc); + hBitmapCapture = CreateCompatibleBitmap(hdc, + preview.bmSize.cx, + preview.bmSize.cy); + SelectObject(preview.hdc2, hBitmapCapture); + } + + fr.hdc = preview.hdc2; + draw_preview(hEditorWnd, &fr, &fr.rcPage, preview.page + 1); + } + DeleteDC(fr.hdcTarget); + ReleaseDC(hwndPreview, hdc); update_scaled_preview(hMainWnd); + update_preview_buttons(hMainWnd); } static void toggle_num_pages(HWND hMainWnd)

1 0

Jacek Caban : mshtml: Get rid of nsIWineURI::[GS]etNSContainer.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 0f6f96ea63b7539a1ffee16468d752c9a3d21a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6f96ea63b7539a1ffee1646… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 21 21:09:11 2010 +0100 mshtml: Get rid of nsIWineURI::[GS]etNSContainer. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 4 --- dlls/mshtml/nsio.c | 55 +++++++++++++----------------------------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 604c80a..778f290 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -176,6 +176,7 @@ typedef struct HTMLWindow HTMLWindow; typedef struct HTMLDocumentNode HTMLDocumentNode; typedef struct HTMLDocumentObj HTMLDocumentObj; typedef struct HTMLFrameBase HTMLFrameBase; +typedef struct NSContainer NSContainer; typedef enum { SCRIPTMODE_GECKO, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index a2bee26..0ab0f7c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2834,8 +2834,4 @@ interface nsIDocumentObserver : nsIMutationObserver ] interface nsIWineURI : nsIURL { - typedef struct NSContainer NSContainer; - - nsresult GetNSContainer(NSContainer **aNSContainer); - nsresult SetNSContainer(NSContainer *aNSContainer); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c2652c5..2d1ae9e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -268,6 +268,20 @@ HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) return S_OK; } +static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) +{ + if(This->container) { + if(This->container == nscontainer) + return; + TRACE("Changing %p -> %p\n", This->container, nscontainer); + nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); + } + + if(nscontainer) + nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); + This->container = nscontainer; +} + static void set_uri_window(nsWineURI *This, HTMLWindow *window) { if(This->window_ref) { @@ -282,7 +296,7 @@ static void set_uri_window(nsWineURI *This, HTMLWindow *window) This->window_ref = window->window_ref; if(window->doc_obj) - nsIWineURI_SetNSContainer(NSWINEURI(This), window->doc_obj->nscontainer); + set_uri_nscontainer(This, window->doc_obj->nscontainer); }else { This->window_ref = NULL; } @@ -2096,39 +2110,6 @@ static nsresult NSAPI nsURL_GetRelativeSpec(nsIWineURI *iface, nsIURI *aURIToCom return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetNSContainer(nsIWineURI *iface, NSContainer **aContainer) -{ - nsWineURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aContainer); - - if(This->container) - nsIWebBrowserChrome_AddRef(NSWBCHROME(This->container)); - *aContainer = This->container; - - return NS_OK; -} - -static nsresult NSAPI nsURI_SetNSContainer(nsIWineURI *iface, NSContainer *aContainer) -{ - nsWineURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aContainer); - - if(This->container) { - if(This->container == aContainer) - return NS_OK; - TRACE("Changing %p -> %p\n", This->container, aContainer); - nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); - } - - if(aContainer) - nsIWebBrowserChrome_AddRef(NSWBCHROME(aContainer)); - This->container = aContainer; - - return NS_OK; -} - #undef NSURI_THIS static const nsIWineURIVtbl nsWineURIVtbl = { @@ -2178,9 +2159,7 @@ static const nsIWineURIVtbl nsWineURIVtbl = { nsURL_GetFileExtension, nsURL_SetFileExtension, nsURL_GetCommonBaseSpec, - nsURL_GetRelativeSpec, - nsURI_GetNSContainer, - nsURI_SetNSContainer, + nsURL_GetRelativeSpec }; static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) @@ -2191,7 +2170,7 @@ static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *contain ret->ref = 1; ret->uri = uri; - nsIWineURI_SetNSContainer(NSWINEURI(ret), container); + set_uri_nscontainer(ret, container); set_uri_window(ret, window); if(uri)

1 0

Jacek Caban : mshtml: Get rid of nsIWineURI interface.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 6b46c9e5ade2e113177c64a99e4516ca5bed7f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b46c9e5ade2e113177c64a99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 21 21:10:15 2010 +0100 mshtml: Get rid of nsIWineURI interface. --- dlls/mshtml/nsiface.idl | 15 ----- dlls/mshtml/nsio.c | 138 ++++++++++++++++++++++++----------------------- 2 files changed, 70 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b46c9e5ade2e113177c6…

1 0