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

Dylan Smith : wordpad: Search finished message box should be modal.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: dd789d50f27bf221e33ef93f5a6c896606e18c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd789d50f27bf221e33ef93f5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:18:17 2010 -0400 wordpad: Search finished message box should be modal. --- programs/wordpad/wordpad.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index edee1f8..845b9ae 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1288,8 +1288,10 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if (ret == -1) { custom_data->endPos = -1; - MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), - wszAppTitle, MB_OK | MB_ICONASTERISK); + EnableWindow(hMainWnd, FALSE); + MessageBoxWithResStringW(hFindWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), + wszAppTitle, MB_OK | MB_ICONASTERISK | MB_TASKMODAL); + EnableWindow(hMainWnd, TRUE); } else { SendMessageW(hEditorWnd, EM_SETSEL, ft.chrgText.cpMin, ft.chrgText.cpMax); SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0);

1 0

Dylan Smith : wordpad: Reduce unnecessary flicker from extra background erasing.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 6c9edce1a877ce67dd6c0a2e9aba1f94b8791b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9edce1a877ce67dd6c0a2e9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:20:48 2010 -0400 wordpad: Reduce unnecessary flicker from extra background erasing. --- programs/wordpad/print.c | 2 +- programs/wordpad/wordpad.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 231c90e..475d833 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -781,7 +781,7 @@ static void update_scaled_preview(HWND hMainWnd) !is_last_preview_page(preview.page)); } - InvalidateRect(hwndPreview, NULL, TRUE); + InvalidateRect(hwndPreview, NULL, FALSE); DeleteDC(fr.hdcTarget); } diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 845b9ae..80fe19d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2701,7 +2701,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar hAccel = LoadAcceleratorsW(hInstance, wszAccelTable); wc.cbSize = sizeof(wc); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 4; @@ -2715,7 +2715,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.lpszClassName = wszMainWndClass; RegisterClassExW(&wc); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = preview_proc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -2723,7 +2723,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.hIcon = NULL; wc.hIconSm = NULL; wc.hCursor = LoadCursor(NULL, IDC_IBEAM); - wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = wszPreviewWndClass; RegisterClassExW(&wc);

1 0

Dylan Smith : wordpad: Remove sized print preview page buffer.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 0cd3ee3d91d817010f9010b59b478084a1bae909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd3ee3d91d817010f9010b59… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:20:59 2010 -0400 wordpad: Remove sized print preview page buffer. This extra buffer only saves the result of the StretchBlt operatation, which isn't worth doing since a BitBlt will still be needed from the buffer to the screen. This causes noticable delay on resizing since a new sized bitmap needs to be created, the old bitmap needs to be destroyed, and then both a StretchBlt and a Bitblt is needed to actually repaint the window. --- programs/wordpad/print.c | 140 ++++++++++++++++------------------------------ 1 files changed, 48 insertions(+), 92 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 475d833..e77a596 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -33,8 +33,6 @@ typedef struct _previewinfo int textlength; HDC hdc; HDC hdc2; - HDC hdcSized; - HDC hdcSized2; RECT window; RECT rcPage; SIZE bmSize; @@ -705,43 +703,44 @@ 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, BOOL draw_margins) +static void draw_margin_lines(HDC hdc, int x, int y, float ratio) { - HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); - HBITMAP oldbm; 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); - int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + SIZE dpi; + RECT page_margin = preview.rcPage; - if(*hdcSized) { - oldbm = SelectObject(*hdcSized, hBitmapScaled); - DeleteObject(oldbm); - } else { - *hdcSized = CreateCompatibleDC(hdc); - SelectObject(*hdcSized, hBitmapScaled); - } + dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); + dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); + + page_margin.left = preview.rcPage.left + margins.left; + page_margin.top = preview.rcPage.top + margins.top; + page_margin.bottom = preview.rcPage.bottom - margins.bottom; + page_margin.right = preview.rcPage.right - margins.right; - StretchBlt(*hdcSized, 0, 0, bmNewWidth, bmNewHeight, hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); + page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); + page_margin.bottom = (int)((float)twips_to_pixels(page_margin.bottom, dpi.cy) * ratio); + page_margin.right = (int)((float)twips_to_pixels(page_margin.right, dpi.cx) * ratio); - if (!draw_margins) return; + page_margin.left += x; + page_margin.top += y; + page_margin.bottom += y; + page_margin.right += x; - /* Draw margin lines */ hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); - oldPen = SelectObject(*hdcSized, hPen); + oldPen = SelectObject(hdc, hPen); - MoveToEx(*hdcSized, 0, TopMargin, NULL); - LineTo(*hdcSized, bmNewWidth, TopMargin); - MoveToEx(*hdcSized, 0, BottomMargin, NULL); - LineTo(*hdcSized, bmNewWidth, BottomMargin); + MoveToEx(hdc, x, page_margin.top, NULL); + LineTo(hdc, x + preview.bmScaledSize.cx, page_margin.top); + MoveToEx(hdc, x, page_margin.bottom, NULL); + LineTo(hdc, x + preview.bmScaledSize.cx, page_margin.bottom); - MoveToEx(*hdcSized, LeftMargin, 0, NULL); - LineTo(*hdcSized, LeftMargin, bmNewHeight); - MoveToEx(*hdcSized, RightMargin, 0, NULL); - LineTo(*hdcSized, RightMargin, bmNewHeight); + MoveToEx(hdc, page_margin.left, y, NULL); + LineTo(hdc, page_margin.left, y + preview.bmScaledSize.cy); + MoveToEx(hdc, page_margin.right, y, NULL); + LineTo(hdc, page_margin.right, y + preview.bmScaledSize.cy); - SelectObject(*hdcSized, oldPen); + SelectObject(hdc, oldPen); DeleteObject(hPen); } @@ -750,41 +749,6 @@ static BOOL is_last_preview_page(int page) return preview.pageEnds[page - 1] >= preview.textlength; } -/* Update for zoom ratio changes with same page. */ -static void update_scaled_preview(HWND hMainWnd) -{ - 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, TRUE); - - 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, - !is_last_preview_page(preview.page)); - } - - InvalidateRect(hwndPreview, NULL, FALSE); - DeleteDC(fr.hdcTarget); -} - void init_preview(HWND hMainWnd, LPWSTR wszFileName) { HINSTANCE hInstance = GetModuleHandleW(0); @@ -824,18 +788,6 @@ void close_preview(HWND hMainWnd) 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); @@ -896,19 +848,19 @@ static LRESULT print_preview(HWND hwndPreview) HDC hdc; RECT window, background; PAINTSTRUCT ps; - POINT scrollpos; + int x, y; hdc = BeginPaint(hwndPreview, &ps); GetClientRect(hwndPreview, &window); FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); - scrollpos.x = GetScrollPos(hwndPreview, SB_HORZ); - scrollpos.y = GetScrollPos(hwndPreview, SB_VERT); + x = preview.spacing.cx - GetScrollPos(hwndPreview, SB_HORZ); + y = preview.spacing.cy - GetScrollPos(hwndPreview, SB_VERT); - background.left = preview.spacing.cx - 2 - scrollpos.x; + background.left = x - 2; background.right = background.left + preview.bmScaledSize.cx + 4; - background.top = preview.spacing.cy - 2 - scrollpos.y; + background.top = y - 2; background.bottom = background.top + preview.bmScaledSize.cy + 4; FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); @@ -921,15 +873,19 @@ static LRESULT print_preview(HWND hwndPreview) FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); } - BitBlt(hdc, preview.spacing.cx - scrollpos.x, preview.spacing.cy - scrollpos.y, - preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.hdcSized, 0, 0, SRCCOPY); + StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + + draw_margin_lines(hdc, x, y, preview.zoomratio); if(preview.pages_shown > 1) { - BitBlt(hdc, preview.spacing.cx * 2 + preview.bmScaledSize.cx - scrollpos.x, - preview.spacing.cy - scrollpos.y, preview.bmScaledSize.cx, - preview.bmScaledSize.cy, preview.hdcSized2, 0, 0, SRCCOPY); + x += preview.spacing.cx + preview.bmScaledSize.cx; + StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc2, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + + if (!is_last_preview_page(preview.page)) + draw_margin_lines(hdc, x, y, preview.zoomratio); } preview.window = window; @@ -1011,7 +967,7 @@ static void update_preview(HWND hMainWnd) DeleteDC(fr.hdcTarget); ReleaseDC(hwndPreview, hdc); - update_scaled_preview(hMainWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hMainWnd); update_preview_statusbar(hMainWnd); } @@ -1103,7 +1059,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_SIZE: { update_preview_sizes(hWnd, FALSE); - update_scaled_preview(hWnd); + InvalidateRect(hWnd, NULL, FALSE); break; } @@ -1216,7 +1172,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) toggle_num_pages(hMainWnd); } else { update_preview_sizes(hWnd, TRUE); - update_scaled_preview(hMainWnd); + InvalidateRect(hWnd, NULL, FALSE); update_preview_buttons(hMainWnd); } @@ -1285,7 +1241,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) } else { HWND hwndPreview = GetDlgItem(hWnd, IDC_PREVIEW); update_preview_sizes(hwndPreview, TRUE); - update_scaled_preview(hWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hWnd); } } @@ -1301,7 +1257,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) toggle_num_pages(hWnd); } else { update_preview_sizes(hwndPreview, TRUE); - update_scaled_preview(hWnd); + InvalidateRect(hwndPreview, NULL, FALSE); update_preview_buttons(hWnd); } }

1 0

Dylan Smith : wordpad: Avoid filling overlapping rectangles in print preview.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 9de8357965e68a04290763db0d528cd3c21ffac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de8357965e68a04290763db0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:21:07 2010 -0400 wordpad: Avoid filling overlapping rectangles in print preview. This reduces the amount of flicker seen from redrawing the window. --- programs/wordpad/print.c | 48 +++++++++++++++++++++++++++++++++------------ 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index e77a596..7761c32 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -845,33 +845,46 @@ static void update_preview_buttons(HWND hMainWnd) static LRESULT print_preview(HWND hwndPreview) { + HPEN hPen, oldPen; HDC hdc; + HRGN back_rgn, excl_rgn; RECT window, background; PAINTSTRUCT ps; int x, y; hdc = BeginPaint(hwndPreview, &ps); GetClientRect(hwndPreview, &window); - - FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); + back_rgn = CreateRectRgnIndirect(&window); x = preview.spacing.cx - GetScrollPos(hwndPreview, SB_HORZ); y = preview.spacing.cy - GetScrollPos(hwndPreview, SB_VERT); + /* draw page outlines */ + hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); + oldPen = SelectObject(hdc, hPen); background.left = x - 2; - background.right = background.left + preview.bmScaledSize.cx + 4; + background.right = x + preview.bmScaledSize.cx + 2; background.top = y - 2; - background.bottom = background.top + preview.bmScaledSize.cy + 4; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); - + background.bottom = y + preview.bmScaledSize.cy + 2; + Rectangle(hdc, background.left, background.top, + background.right, background.bottom); + excl_rgn = CreateRectRgnIndirect(&background); + CombineRgn(back_rgn, back_rgn, excl_rgn, RGN_DIFF); if(preview.pages_shown > 1) { background.left += preview.bmScaledSize.cx + preview.spacing.cx; background.right += preview.bmScaledSize.cx + preview.spacing.cx; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + Rectangle(hdc, background.left, background.top, + background.right, background.bottom); + SetRectRgn(excl_rgn, background.left, background.top, + background.right, background.bottom); + CombineRgn(back_rgn, back_rgn, excl_rgn, RGN_DIFF); } + SelectObject(hdc, oldPen); + DeleteObject(hPen); + FillRgn(hdc, back_rgn, GetStockObject(GRAY_BRUSH)); + DeleteObject(excl_rgn); + DeleteObject(back_rgn); StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, preview.hdc, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); @@ -880,12 +893,21 @@ static LRESULT print_preview(HWND hwndPreview) if(preview.pages_shown > 1) { - x += preview.spacing.cx + preview.bmScaledSize.cx; - StretchBlt(hdc, x, y, preview.bmScaledSize.cx, preview.bmScaledSize.cy, - preview.hdc2, 0, 0, preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); + if (!is_last_preview_page(preview.page)) { + x += preview.spacing.cx + preview.bmScaledSize.cx; + StretchBlt(hdc, x, y, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdc2, 0, 0, + preview.bmSize.cx, preview.bmSize.cy, SRCCOPY); - if (!is_last_preview_page(preview.page)) draw_margin_lines(hdc, x, y, preview.zoomratio); + } else { + background.left += 2; + background.right -= 2; + background.top += 2; + background.bottom -= 2; + FillRect(hdc, &background, GetStockObject(WHITE_BRUSH)); + } } preview.window = window;

1 0

Dylan Smith : wordpad: Save and load word wrap registry options.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: c37cdce905fc773ac1dc8469307d688bc80c06f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37cdce905fc773ac1dc84693… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 19 18:22:22 2010 -0400 wordpad: Save and load word wrap registry options. --- programs/wordpad/registry.c | 32 +++++++++++++++++++++++--------- programs/wordpad/wordpad.c | 2 +- programs/wordpad/wordpad.h | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 7311fb6..472ed4d 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -34,6 +34,7 @@ static const WCHAR key_text[] = {'T','e','x','t',0}; static const WCHAR var_file[] = {'F','i','l','e','%','d',0}; static const WCHAR var_framerect[] = {'F','r','a','m','e','R','e','c','t',0}; static const WCHAR var_barstate0[] = {'B','a','r','S','t','a','t','e','0',0}; +static const WCHAR var_wrap[] = {'W','r','a','p',0}; static const WCHAR var_maximized[] = {'M','a','x','i','m','i','z','e','d',0}; static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) @@ -377,10 +378,22 @@ static void registry_read_formatopts(int index, LPCWSTR key, DWORD barState[], D if(!fetched) barState[index] = (1 << BANDID_TOOLBAR) | (1 << BANDID_FORMATBAR) | (1 << BANDID_RULER) | (1 << BANDID_STATUSBAR); - if(index == reg_formatindex(SF_RTF)) - wordWrap[index] = ID_WORDWRAP_WINDOW; - else if(index == reg_formatindex(SF_TEXT)) - wordWrap[index] = ID_WORDWRAP_NONE; + fetched = FALSE; + if(action == REG_OPENED_EXISTING_KEY) + { + DWORD size = sizeof(DWORD); + if(RegQueryValueExW(hKey, var_wrap, 0, NULL, (LPBYTE)&wordWrap[index], + &size) == ERROR_SUCCESS) + fetched = TRUE; + } + + if (!fetched) + { + if(index == reg_formatindex(SF_RTF)) + wordWrap[index] = ID_WORDWRAP_WINDOW; + else if(index == reg_formatindex(SF_TEXT)) + wordWrap[index] = ID_WORDWRAP_NONE; + } RegCloseKey(hKey); } @@ -391,7 +404,7 @@ void registry_read_formatopts_all(DWORD barState[], DWORD wordWrap[]) registry_read_formatopts(reg_formatindex(SF_TEXT), key_text, barState, wordWrap); } -static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[]) +static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[], DWORD wordWrap[]) { HKEY hKey; DWORD action = 0; @@ -400,13 +413,14 @@ static void registry_set_formatopts(int index, LPCWSTR key, DWORD barState[]) { RegSetValueExW(hKey, var_barstate0, 0, REG_DWORD, (LPBYTE)&barState[index], sizeof(DWORD)); - + RegSetValueExW(hKey, var_wrap, 0, REG_DWORD, (LPBYTE)&wordWrap[index], + sizeof(DWORD)); RegCloseKey(hKey); } } -void registry_set_formatopts_all(DWORD barState[]) +void registry_set_formatopts_all(DWORD barState[], DWORD wordWrap[]) { - registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf, barState); - registry_set_formatopts(reg_formatindex(SF_TEXT), key_text, barState); + registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf, barState, wordWrap); + registry_set_formatopts(reg_formatindex(SF_TEXT), key_text, barState, wordWrap); } diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 80fe19d..abd7cd2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2639,7 +2639,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara } else if(prompt_save_changes()) { registry_set_options(hMainWnd); - registry_set_formatopts_all(barState); + registry_set_formatopts_all(barState, wordWrap); PostQuitMessage(0); } break; diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index c3c5bc0..f50881a 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -262,5 +262,5 @@ void registry_read_formatopts_all(DWORD[], DWORD[]); void registry_read_winrect(RECT*); void registry_read_maximized(DWORD*); void registry_set_filelist(LPCWSTR, HWND); -void registry_set_formatopts_all(DWORD[]); +void registry_set_formatopts_all(DWORD[], DWORD[]); void registry_set_options(HWND);

1 0

Igor Paliychuk : cryptui: Add Ukrainian translation.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 35b65ca550c04c51c640afc50e1fb35b8dc97091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b65ca550c04c51c640afc50… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Jul 19 19:44:17 2010 +0300 cryptui: Add Ukrainian translation. --- dlls/cryptui/Makefile.in | 3 +- dlls/cryptui/cryptui_Uk.rc | 468 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 470 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35b65ca550c04c51c640a…

1 0

Andrey Turkin : oleaut32: Reuse existing function to encode custom data.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: eb039179356719eeba92205db3087d68464a2697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb039179356719eeba92205db… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jul 17 11:39:56 2010 +0400 oleaut32: Reuse existing function to encode custom data. --- dlls/oleaut32/typelib2.c | 293 +++++++++++++++++++--------------------------- 1 files changed, 121 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb039179356719eeba922…

1 0

Alexandre Julliard : tests: Run all tests with the default FPU control word .
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: b14cfdeea4a2540d76749a6571a80195b8a53913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14cfdeea4a2540d76749a657… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 11:41:05 2010 +0200 tests: Run all tests with the default FPU control word. --- dlls/kernel32/tests/thread.c | 2 -- include/wine/test.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 3da29a2..19e695b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1329,8 +1329,6 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } -void _fpreset(void) {} /* override the mingw fpu init code */ - static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) diff --git a/include/wine/test.h b/include/wine/test.h index 6ff4372..1a98025 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -590,6 +590,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +void _fpreset(void) {} /* override the mingw fpu init code */ + /* main function */ int main( int argc, char **argv ) {

1 0

Michael Stefaniuc : cmd: Remove stray ';' from the resource files.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: dbdedefe71908d7a8618301f0bb0f8f7f607f637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdedefe71908d7a8618301f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 20 10:07:24 2010 +0200 cmd: Remove stray ';' from the resource files. --- programs/cmd/Cs.rc | 2 +- programs/cmd/Da.rc | 2 +- programs/cmd/De.rc | 2 +- programs/cmd/En.rc | 2 +- programs/cmd/Es.rc | 2 +- programs/cmd/Fr.rc | 2 +- programs/cmd/It.rc | 2 +- programs/cmd/Ja.rc | 2 +- programs/cmd/Ko.rc | 2 +- programs/cmd/Lt.rc | 2 +- programs/cmd/Nl.rc | 2 +- programs/cmd/No.rc | 2 +- programs/cmd/Pl.rc | 2 +- programs/cmd/Pt.rc | 4 ++-- programs/cmd/Ru.rc | 2 +- programs/cmd/Si.rc | 2 +- programs/cmd/Tr.rc | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbdedefe71908d7a86183…

1 0

David Hedberg : shell32: Shell_MergeMenus should be declared in shlobj. h and exported by name.
by Alexandre Julliard 20 Jul '10

20 Jul '10

Module: wine Branch: master Commit: 65f6ab7c8646da4f5d0a46c3e5fad8189f7a04c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f6ab7c8646da4f5d0a46c3e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 10:11:48 2010 +0200 shell32: Shell_MergeMenus should be declared in shlobj.h and exported by name. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.h | 5 ----- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 -- dlls/shell32/undocshell.h | 4 ---- include/shlobj.h | 6 ++++++ 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f913872..ee6f8a5 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -62,7 +62,7 @@ 64 stdcall -noname DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall -noname IsNetDrive(long) - 67 stdcall -noname Shell_MergeMenus(long long long long long long) + 67 stdcall -ordinal Shell_MergeMenus(long long long long long long) 68 stdcall -noname SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource 70 stdcall -noname SHCreateDefClassObject(long long long long long) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 8f51850..3eecdad 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -108,11 +108,6 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST); LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST); -/* menu merging */ -#define MM_ADDSEPARATOR 0x00000001L -#define MM_SUBMENUSHAVEIDS 0x00000002L -HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); - /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \ {\ diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index aea319c..ae13ff8 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -857,7 +857,7 @@ static BOOL _SHIsMenuSeparator(HMENU hm, int i) /************************************************************************* * Shell_MergeMenus [SHELL32.67] */ -HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags) +UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags) { int nItem; HMENU hmSubMenu; BOOL bAlreadySeparated; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 08867c8..3e9a2e4 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2309,8 +2309,6 @@ static void test_unicode(void) ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); } -extern HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); - static void test_shlmenu(void) { HRESULT hres; diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 513006d..fa0ac05 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -191,10 +191,6 @@ int WINAPI Shell_GetCachedImageIndex( UINT nIconIndex, BOOL bSimulateDoc); -BOOL WINAPI Shell_GetImageLists( - HIMAGELIST *lphimlLarge, - HIMAGELIST *lphimlSmall); - HICON WINAPI SHGetFileIcon( DWORD dwReserved, LPCSTR lpszPath, diff --git a/include/shlobj.h b/include/shlobj.h index 5f125c1..bd00d21 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -82,6 +82,7 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); BOOL WINAPI IsUserAnAdmin(void); +UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */ @@ -116,6 +117,11 @@ BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); int WINAPI PathCleanupSpec(LPCWSTR,LPWSTR); +/* Shell_MergeMenus flags */ +#define MM_ADDSEPARATOR 0x00000001 +#define MM_SUBMENUSHAVEIDS 0x00000002 +#define MM_DONTREMOVESEPS 0x00000004 + /***************************************************************************** * IContextMenu interface */

1 0