September 2007 - Wine-commits

Alexander Nicolaysen Sørnes : wordpad: Add about window.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: dfb29f4d15dde9e959dcb9acc586cc34462ce80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb29f4d15dde9e959dcb9acc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:05:40 2007 +0200 wordpad: Add about window. --- programs/wordpad/De.rc | 4 ++++ programs/wordpad/En.rc | 4 ++++ programs/wordpad/Fr.rc | 4 ++++ programs/wordpad/Hu.rc | 4 ++++ programs/wordpad/Ko.rc | 4 ++++ programs/wordpad/Nl.rc | 4 ++++ programs/wordpad/No.rc | 4 ++++ programs/wordpad/Pl.rc | 4 ++++ programs/wordpad/Ru.rc | 4 ++++ programs/wordpad/Tr.rc | 4 ++++ programs/wordpad/resource.h | 2 ++ programs/wordpad/wordpad.c | 11 +++++++++++ 12 files changed, 53 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index d25a034..2ea2a75 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -79,6 +79,10 @@ BEGIN MENUITEM "&PostIt-Notiz\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 2ac43e3..b6f971e 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -79,6 +79,10 @@ BEGIN MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index b343de7..c2802d5 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -79,6 +79,10 @@ BEGIN MENUITEM "&Jaunasse\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 142efee..f31f6bb 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -79,6 +79,10 @@ BEGIN MENUITEM "&S�rg�ban k�rem\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index b3edd53..fbfb8b0 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -80,6 +80,10 @@ BEGIN MENUITEM "��(&P)\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 58193ef..86cae2c 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -79,6 +79,10 @@ BEGIN MENUITEM "&Geeltje\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index a135909..5632559 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -79,6 +79,10 @@ BEGIN MENUITEM "Merkela&pp-gult\tCtrl+2", ID_BACK_2 END END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 7232aaa..9fe6121 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -80,6 +80,10 @@ BEGIN MENUITEM "&PostThat (��ty)\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 78d2212..8c44f94 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -78,6 +78,10 @@ BEGIN MENUITEM "&�� PostThat\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index b5e0c5e..9b4c454 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -82,6 +82,10 @@ BEGIN MENUITEM "&Sar�mt�rak\tCtrl+2", ID_BACK_2 END END + POPUP "&Help" + BEGIN + MENUITEM "&About Wine Wordpad" ID_ABOUT + END END IDM_POPUP MENU DISCARDABLE diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 75a18e5..d742339 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -85,6 +85,8 @@ #define ID_PARAFORMAT 1601 #define ID_TABSTOPS 1602 +#define ID_ABOUT 1603 + #define IDC_STATUSBAR 2000 #define IDC_EDITOR 2001 #define IDC_TOOLBAR 2002 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8b0ca5a..8c3d2a2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1095,6 +1095,13 @@ static void dialog_print(void) } } +static void dialog_about(void) +{ + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HICON icon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); + ShellAboutW(hMainWnd, wszAppTitle, 0, icon); +} + static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; @@ -2197,6 +2204,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) } break; + case ID_ABOUT: + dialog_about(); + break; + default: SendMessageW(hwndEditor, WM_COMMAND, wParam, lParam); break;

1 0

Alexander Nicolaysen Sørnes : wordpad: Re-order format clearing when selecting new file.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: cd97bf4e74e553bc3fff8339b530563066267a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd97bf4e74e553bc3fff8339b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:02:23 2007 +0200 wordpad: Re-order format clearing when selecting new file. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 456f33f..de58c2f 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1867,12 +1867,12 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) set_caption(NULL); wszFileName[0] = '\0'; + clear_formatting(); + st.flags = ST_DEFAULT; st.codepage = 1200; SendMessageW(hEditorWnd, EM_SETTEXTEX, (WPARAM)&st, 0); - clear_formatting(); - SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); set_fileformat(ret); }

1 0

Alexander Nicolaysen Sørnes : wordpad: Store page margins in the registry.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 6d73cd11384fdae196a9fc713e3100e0d083db3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d73cd11384fdae196a9fc713… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 01:45:30 2007 +0200 wordpad: Store page margins in the registry. --- programs/wordpad/wordpad.c | 78 ++++++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 28 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index bb744c2..8d302bf 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -53,11 +53,10 @@ static const WCHAR key_options[] = {'O','p','t','i','o','n','s',0}; static const WCHAR key_rtf[] = {'R','T','F',0}; 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_pagemargin[] = {'P','a','g','e','M','a','r','g','i','n',0}; static HWND hMainWnd; static HWND hEditorWnd; @@ -270,7 +269,9 @@ static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) return ret; } -static void registry_set_winrect(void) +static RECT margins; + +static void registry_set_options(void) { HKEY hKey; DWORD action; @@ -282,6 +283,8 @@ static void registry_set_winrect(void) GetWindowRect(hMainWnd, &rc); RegSetValueExW(hKey, var_framerect, 0, REG_BINARY, (LPBYTE)&rc, sizeof(RECT)); + + RegSetValueExW(hKey, var_pagemargin, 0, REG_BINARY, (LPBYTE)&margins, sizeof(RECT)); } } @@ -920,7 +923,10 @@ static int centmm_to_twips(int mm) return MulDiv(mm, 567, 1000); } -static RECT margins; +static int twips_to_centmm(int twips) +{ + return MulDiv(twips, 1000, 567); +} static HGLOBAL devMode; @@ -938,10 +944,10 @@ static void print(LPPRINTDLGW pd) width = devunits_to_twips(GetDeviceCaps(fr.hdc, PHYSICALWIDTH), dpiX); height = devunits_to_twips(GetDeviceCaps(fr.hdc, PHYSICALHEIGHT), dpiY); - fr.rc.left = centmm_to_twips(margins.left); - fr.rc.right = width - centmm_to_twips(margins.right); - fr.rc.top = centmm_to_twips(margins.top); - fr.rc.bottom = height - centmm_to_twips(margins.bottom); + fr.rc.left = margins.left; + fr.rc.right = width - margins.right; + fr.rc.top = margins.top; + fr.rc.bottom = height - margins.bottom; fr.rcPage.left = 0; fr.rcPage.right = width; fr.rcPage.top = 0; @@ -987,14 +993,6 @@ static void print(LPPRINTDLGW pd) SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); } -static void registry_read_margins(void) -{ - margins.top = 2500; - margins.bottom = 2500; - margins.left = 3100; - margins.right = 3100; -} - static void dialog_printsetup(void) { PAGESETUPDLGW ps; @@ -1003,12 +1001,18 @@ static void dialog_printsetup(void) ps.lStructSize = sizeof(ps); ps.hwndOwner = hMainWnd; ps.Flags = PSD_INHUNDREDTHSOFMILLIMETERS | PSD_MARGINS; - ps.rtMargin = margins; + ps.rtMargin.left = twips_to_centmm(margins.left); + ps.rtMargin.right = twips_to_centmm(margins.right); + ps.rtMargin.top = twips_to_centmm(margins.top); + ps.rtMargin.bottom = twips_to_centmm(margins.bottom); ps.hDevMode = devMode; if(PageSetupDlgW(&ps)) { - margins = ps.rtMargin; + margins.left = centmm_to_twips(ps.rtMargin.left); + margins.right = centmm_to_twips(ps.rtMargin.right); + margins.top = centmm_to_twips(ps.rtMargin.top); + margins.bottom = centmm_to_twips(ps.rtMargin.bottom); devMode = ps.hDevMode; } } @@ -1190,7 +1194,25 @@ static void dialog_find(LPFINDREPLACEW fr) hFindWnd = FindTextW(fr); } -static void registry_read_options_format(int index, LPCWSTR key) +static void registry_read_options(void) +{ + HKEY hKey; + DWORD size = sizeof(RECT); + + if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || + RegQueryValueExW(hKey, var_pagemargin, 0, NULL, (LPBYTE)&margins, + &size) != ERROR_SUCCESS || size != sizeof(RECT)) + { + margins.top = 1417; + margins.bottom = 1417; + margins.left = 1757; + margins.right = 1757; + } + + RegCloseKey(hKey); +} + +static void registry_read_formatopts(int index, LPCWSTR key) { HKEY hKey; DWORD action = 0; @@ -1215,13 +1237,13 @@ static void registry_read_options_format(int index, LPCWSTR key) RegCloseKey(hKey); } -static void registry_read_options(void) +static void registry_read_formatopts_all(void) { - registry_read_options_format(reg_formatindex(SF_RTF), key_rtf); - registry_read_options_format(reg_formatindex(SF_TEXT), key_text); + registry_read_formatopts(reg_formatindex(SF_RTF), key_rtf); + registry_read_formatopts(reg_formatindex(SF_TEXT), key_text); } -static void registry_set_options_format(int index, LPCWSTR key) +static void registry_set_formatopts(int index, LPCWSTR key) { HKEY hKey; DWORD action = 0; @@ -1235,10 +1257,10 @@ static void registry_set_options_format(int index, LPCWSTR key) } } -static void registry_set_options(void) +static void registry_set_formatopts_all(void) { - registry_set_options_format(reg_formatindex(SF_RTF), key_rtf); - registry_set_options_format(reg_formatindex(SF_TEXT), key_text); + registry_set_formatopts(reg_formatindex(SF_RTF), key_rtf); + registry_set_formatopts(reg_formatindex(SF_TEXT), key_text); } static int current_units_to_twips(float number) @@ -1698,8 +1720,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) ID_FINDMSGSTRING = RegisterWindowMessageW(FINDMSGSTRINGW); registry_read_filelist(hWnd); + registry_read_formatopts_all(); registry_read_options(); - registry_read_margins(); DragAcceptFiles(hWnd, TRUE); return 0; @@ -2235,8 +2257,8 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_CLOSE: if(prompt_save_changes()) { - registry_set_winrect(); registry_set_options(); + registry_set_formatopts_all(); PostQuitMessage(0); } break;

1 0

Alexander Nicolaysen Sørnes : wordpad: Add quick print support.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: f586e1cce11658ed0f45541e34b90ca07655e00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f586e1cce11658ed0f45541e3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:00:44 2007 +0200 wordpad: Add quick print support. --- programs/wordpad/resource.h | 5 +++-- programs/wordpad/wordpad.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 7915568..9264cd8 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -31,9 +31,10 @@ #define ID_PRINT 1010 #define ID_PREVIEW 1011 #define ID_PRINTSETUP 1012 +#define ID_PRINT_QUICK 1013 -#define ID_FIND 1013 -#define ID_FIND_NEXT 1014 +#define ID_FIND 1014 +#define ID_FIND_NEXT 1015 #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8d302bf..456f33f 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -929,6 +929,7 @@ static int twips_to_centmm(int twips) } static HGLOBAL devMode; +static HGLOBAL devNames; static void print(LPPRINTDLGW pd) { @@ -1006,6 +1007,7 @@ static void dialog_printsetup(void) ps.rtMargin.top = twips_to_centmm(margins.top); ps.rtMargin.bottom = twips_to_centmm(margins.bottom); ps.hDevMode = devMode; + ps.hDevNames = devNames; if(PageSetupDlgW(&ps)) { @@ -1014,9 +1016,40 @@ static void dialog_printsetup(void) margins.top = centmm_to_twips(ps.rtMargin.top); margins.bottom = centmm_to_twips(ps.rtMargin.bottom); devMode = ps.hDevMode; + devNames = ps.hDevNames; } } +static void print_quick(void) +{ + PRINTDLGW pd; + ZeroMemory(&pd, sizeof(pd)); + + if(devMode && devNames) + { + LPDEVNAMES dn = GlobalLock(devNames); + LPDEVMODEW dm = GlobalLock(devMode); + pd.hDC = CreateDCW((LPWSTR)dn + dn->wDriverOffset, + (LPWSTR)dn + dn->wDeviceOffset, 0, dm); + GlobalUnlock(dn); + GlobalUnlock(dm); + } else + { + ZeroMemory(&pd, sizeof(pd)); + pd.lStructSize = sizeof(pd); + pd.Flags = PD_RETURNDC | PD_RETURNDEFAULT; + pd.hwndOwner = hMainWnd; + pd.hDevMode = (HGLOBAL)devMode; + + PrintDlgW(&pd); + + devMode = pd.hDevMode; + devNames = pd.hDevNames; + } + + print(&pd); +} + static void dialog_print(void) { PRINTDLGW pd; @@ -1030,6 +1063,7 @@ static void dialog_print(void) pd.nMinPage = 1; pd.nMaxPage = 1; pd.hDevMode = devMode; + pd.hDevNames = devNames; SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); if(from == to) @@ -1038,6 +1072,7 @@ static void dialog_print(void) if(PrintDlgW(&pd)) { devMode = pd.hDevMode; + devNames = pd.hDevNames; print(&pd); } } @@ -1643,7 +1678,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) AddButton(hToolBarWnd, nStdBitmaps+STD_FILEOPEN, ID_FILE_OPEN); AddButton(hToolBarWnd, nStdBitmaps+STD_FILESAVE, ID_FILE_SAVE); AddSeparator(hToolBarWnd); - AddButton(hToolBarWnd, nStdBitmaps+STD_PRINT, ID_PRINT); + AddButton(hToolBarWnd, nStdBitmaps+STD_PRINT, ID_PRINT_QUICK); AddButton(hToolBarWnd, nStdBitmaps+STD_PRINTPRE, ID_PREVIEW); AddSeparator(hToolBarWnd); AddButton(hToolBarWnd, nStdBitmaps+STD_FIND, ID_FIND); @@ -1888,6 +1923,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) dialog_print(); break; + case ID_PRINT_QUICK: + print_quick(); + break; + case ID_PREVIEW: { static const WCHAR wszNotImplemented[] = {'N','o','t',' ',

1 0

Alexander Nicolaysen Sørnes : wordpad: Add initial printing support.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 61876c72054459002aedf2ef3e714f0e5d144ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61876c72054459002aedf2ef3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 01:36:29 2007 +0200 wordpad: Add initial printing support. --- programs/wordpad/De.rc | 9 +++- programs/wordpad/En.rc | 9 +++- programs/wordpad/Fr.rc | 9 +++- programs/wordpad/Hu.rc | 9 +++- programs/wordpad/Ko.rc | 15 ++++- programs/wordpad/Nl.rc | 9 +++- programs/wordpad/No.rc | 7 ++ programs/wordpad/Pl.rc | 9 +++- programs/wordpad/Ru.rc | 9 +++- programs/wordpad/Tr.rc | 9 +++- programs/wordpad/resource.h | 4 +- programs/wordpad/rsrc.rc | 1 + programs/wordpad/wordpad.c | 128 +++++++++++++++++++++++++++++++++++++++++++ 13 files changed, 214 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61876c72054459002aedf…

1 0

Alexander Nicolaysen Sørnes : wordpad: Add page setup dialog.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: d5bb616913d1cbfafbf82b5b8cc0433c067ab5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bb616913d1cbfafbf82b5b8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 01:38:08 2007 +0200 wordpad: Add page setup dialog. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 1 + programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 2 + programs/wordpad/resource.h | 5 ++- programs/wordpad/wordpad.c | 52 +++++++++++++++++++++++++++++++++++++++--- 12 files changed, 62 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 4941f49..39ff38f 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Beenden", ID_FILE_EXIT END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index ac30045..835cb01 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "Save &as . . .", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "E&xit", ID_FILE_EXIT END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index b6ed430..1a0d6a2 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Page setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Quitter", ID_FILE_EXIT END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 9bd0682..e2ac6e5 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "Ment�s m�&sk�nt...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Page setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Kil�p�s", ID_FILE_EXIT END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 65ad9e0..f51a8da 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -29,6 +29,7 @@ BEGIN MENUITEM "�ٸ� �̸�� (&A)...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "��(&X)", ID_FILE_EXIT END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index b5a4b33..6416322 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "Ops&laan als...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Afsluiten", ID_FILE_EXIT END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index e6a2457..5c980ce 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Skriv ut . . .\tCtrl+P", ID_PRINT + MENUITEM "&Utskriftformat . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 782a008..7812a79 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -29,6 +29,7 @@ BEGIN MENUITEM "Z&apisz jako...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "Za&ko�cz", ID_FILE_EXIT END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 453d961..ae43e35 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -28,6 +28,7 @@ BEGIN MENUITEM "�� &��...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "�&��", ID_FILE_EXIT END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index c3f06c9..2cd1edf 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -28,8 +28,10 @@ BEGIN MENUITEM "&A�...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM "&Farkl� Kaydet...", ID_FILE_SAVEAS + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Print . . .\tCtrl+P", ID_PRINT + MENUITEM "Pag&e setup . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&��k", ID_FILE_EXIT END diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index ea7b52a..7915568 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -30,9 +30,10 @@ #define ID_PRINT 1010 #define ID_PREVIEW 1011 +#define ID_PRINTSETUP 1012 -#define ID_FIND 1012 -#define ID_FIND_NEXT 1013 +#define ID_FIND 1013 +#define ID_FIND_NEXT 1014 #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 5b84b25..bb744c2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -915,6 +915,15 @@ static LONG devunits_to_twips(int units, int dpi) return (LONG)ret; } +static int centmm_to_twips(int mm) +{ + return MulDiv(mm, 567, 1000); +} + +static RECT margins; + +static HGLOBAL devMode; + static void print(LPPRINTDLGW pd) { FORMATRANGE fr; @@ -929,10 +938,10 @@ static void print(LPPRINTDLGW pd) width = devunits_to_twips(GetDeviceCaps(fr.hdc, PHYSICALWIDTH), dpiX); height = devunits_to_twips(GetDeviceCaps(fr.hdc, PHYSICALHEIGHT), dpiY); - fr.rc.left = devunits_to_twips(GetDeviceCaps(fr.hdc, PHYSICALOFFSETX), dpiX); - fr.rc.right = width - (fr.rc.left * 2); - fr.rc.top = devunits_to_twips(GetDeviceCaps(fr.hdc, PHYSICALOFFSETY), dpiY); - fr.rc.bottom = height - (fr.rc.top * 2); + fr.rc.left = centmm_to_twips(margins.left); + fr.rc.right = width - centmm_to_twips(margins.right); + fr.rc.top = centmm_to_twips(margins.top); + fr.rc.bottom = height - centmm_to_twips(margins.bottom); fr.rcPage.left = 0; fr.rcPage.right = width; fr.rcPage.top = 0; @@ -978,6 +987,32 @@ static void print(LPPRINTDLGW pd) SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); } +static void registry_read_margins(void) +{ + margins.top = 2500; + margins.bottom = 2500; + margins.left = 3100; + margins.right = 3100; +} + +static void dialog_printsetup(void) +{ + PAGESETUPDLGW ps; + + ZeroMemory(&ps, sizeof(ps)); + ps.lStructSize = sizeof(ps); + ps.hwndOwner = hMainWnd; + ps.Flags = PSD_INHUNDREDTHSOFMILLIMETERS | PSD_MARGINS; + ps.rtMargin = margins; + ps.hDevMode = devMode; + + if(PageSetupDlgW(&ps)) + { + margins = ps.rtMargin; + devMode = ps.hDevMode; + } +} + static void dialog_print(void) { PRINTDLGW pd; @@ -990,13 +1025,17 @@ static void dialog_print(void) pd.Flags = PD_RETURNDC | PD_USEDEVMODECOPIESANDCOLLATE; pd.nMinPage = 1; pd.nMaxPage = 1; + pd.hDevMode = devMode; SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); if(from == to) pd.Flags |= PD_NOSELECTION; if(PrintDlgW(&pd)) + { + devMode = pd.hDevMode; print(&pd); + } } static void HandleCommandLine(LPWSTR cmdline) @@ -1660,6 +1699,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) registry_read_filelist(hWnd); registry_read_options(); + registry_read_margins(); DragAcceptFiles(hWnd, TRUE); return 0; @@ -1834,6 +1874,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) } break; + case ID_PRINTSETUP: + dialog_printsetup(); + break; + case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_UNDERLINE:

1 0

Alexander Nicolaysen Sørnes : wordpad: Add paragraph format dialog.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: fd129c23d92ac94f254c2c0ca893d29ad228638d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd129c23d92ac94f254c2c0ca… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 01:15:17 2007 +0200 wordpad: Add paragraph format dialog. --- programs/wordpad/De.rc | 38 ++++++++-- programs/wordpad/En.rc | 38 ++++++++-- programs/wordpad/Fr.rc | 38 ++++++++-- programs/wordpad/Hu.rc | 38 ++++++++-- programs/wordpad/Ko.rc | 38 ++++++++-- programs/wordpad/Nl.rc | 38 ++++++++-- programs/wordpad/No.rc | 38 ++++++++-- programs/wordpad/Pl.rc | 38 ++++++++-- programs/wordpad/Ru.rc | 38 ++++++++-- programs/wordpad/Tr.rc | 38 ++++++++-- programs/wordpad/resource.h | 13 ++++ programs/wordpad/wordpad.c | 165 +++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 498 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd129c23d92ac94f254c2…

1 0

Alexander Nicolaysen Sørnes : wordpad: Add tab stops dialog.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 695a94f139bf12cc1e4a91103cf5b96b37f1197e URL: http://source.winehq.org/git/wine.git/?a=commit;h=695a94f139bf12cc1e4a91103… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 01:27:50 2007 +0200 wordpad: Add tab stops dialog. --- programs/wordpad/De.rc | 15 +++++ programs/wordpad/En.rc | 16 +++++ programs/wordpad/Fr.rc | 15 +++++ programs/wordpad/Hu.rc | 15 +++++ programs/wordpad/Ko.rc | 23 ++++++- programs/wordpad/Nl.rc | 15 +++++ programs/wordpad/No.rc | 15 +++++ programs/wordpad/Pl.rc | 15 +++++ programs/wordpad/Ru.rc | 15 +++++ programs/wordpad/Tr.rc | 15 +++++ programs/wordpad/resource.h | 7 ++ programs/wordpad/wordpad.c | 145 +++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 307 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=695a94f139bf12cc1e4a9…

1 0

Alexander Nicolaysen Sørnes : wordpad: Support drag-and-drop.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 5a2efbcb7d51732ad11c37ad22d569656ffdadd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2efbcb7d51732ad11c37ad2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 22 22:45:11 2007 +0200 wordpad: Support drag-and-drop. --- programs/wordpad/wordpad.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 52ca750..37b7368 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -33,6 +33,7 @@ #include <commctrl.h> #include <commdlg.h> #include <shlobj.h> +#include <shellapi.h> #include "resource.h" @@ -1230,6 +1231,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) registry_read_filelist(hWnd); registry_read_options(); + DragAcceptFiles(hWnd, TRUE); return 0; } @@ -1759,6 +1761,17 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_SIZE: return OnSize( hWnd, wParam, lParam ); + case WM_DROPFILES: + { + WCHAR file[MAX_PATH]; + DragQueryFileW((HDROP)wParam, 0, file, MAX_PATH); + DragFinish((HDROP)wParam); + + if(prompt_save_changes()) + DoOpenFile(file); + } + break; + default: return DefWindowProcW(hWnd, msg, wParam, lParam); }

1 0

Alexander Nicolaysen Sørnes : wordpad: Set default font according to format.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 1faecfe6ed7412e64d4798182fb5aa0c0b8472f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1faecfe6ed7412e64d4798182… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 22 22:51:46 2007 +0200 wordpad: Set default font according to format. --- programs/wordpad/wordpad.c | 45 ++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 37b7368..113b85b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -512,6 +512,30 @@ static WPARAM fileformat_flags(int format) return flags[format]; } +static void set_default_font(void) +{ + static const WCHAR richTextFont[] = {'T','i','m','e','s',' ','N','e','w',' ', + 'R','o','m','a','n',0}; + static const WCHAR plainTextFont[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; + CHARFORMAT2W fmt; + LPCWSTR font; + + ZeroMemory(&fmt, sizeof(fmt)); + + fmt.cbSize = sizeof(fmt); + fmt.dwMask = CFM_FACE | CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE; + fmt.dwEffects = 0; + + if(fileFormat & SF_RTF) + font = richTextFont; + else + font = plainTextFont; + + lstrcpyW(fmt.szFaceName, font); + + SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); +} + static void update_window(void) { RECT rect; @@ -588,6 +612,7 @@ static void set_fileformat(WPARAM format) fileFormat = format; set_bar_states(); + set_default_font(); } static void DoOpenFile(LPCWSTR szOpenFileName) @@ -621,6 +646,7 @@ static void DoOpenFile(LPCWSTR szOpenFileName) es.pfnCallback = stream_in; clear_formatting(); + set_fileformat(format); SendMessageW(hEditorWnd, EM_STREAMIN, format, (LPARAM)&es); CloseHandle(hFile); @@ -953,23 +979,6 @@ static void dialog_find(LPFINDREPLACEW fr) hFindWnd = FindTextW(fr); } - -static void DoDefaultFont(void) -{ - static const WCHAR szFaceName[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; - CHARFORMAT2W fmt; - - ZeroMemory(&fmt, sizeof(fmt)); - - fmt.cbSize = sizeof(fmt); - fmt.dwMask = CFM_FACE | CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE; - fmt.dwEffects = 0; - - lstrcpyW(fmt.szFaceName, szFaceName); - - SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); -} - static void registry_read_options_format(int index, LPCWSTR key) { HKEY hKey; @@ -1222,7 +1231,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) SetFocus(hEditorWnd); SendMessageW(hEditorWnd, EM_SETEVENTMASK, 0, ENM_SELCHANGE); - DoDefaultFont(); + set_default_font(); DoLoadStrings(); SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0);

1 0