Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32046: add font for codepage 775 by <cman at cman dot us> and 852 by <olaf_siejka at o2 dot pl> See issue #3013 for more details.
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 10:38:29 2008 New Revision: 32046 URL: http://svn.reactos.org/svn/reactos?rev=32046&view=rev Log: add font for codepage 775 by <cman at cman dot us> and 852 by <olaf_siejka at o2 dot pl> See issue #3013 for more details. Modified: trunk/reactos/media/vgafont/readme.txt trunk/reactos/media/vgafont/vgafont.bin Modified: trunk/reactos/media/vgafont/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafont/readme.txt?r… ============================================================================== --- trunk/reactos/media/vgafont/readme.txt (original) +++ trunk/reactos/media/vgafont/readme.txt Wed Jan 30 10:38:29 2008 @@ -7,4 +7,8 @@ http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp850-8x8.fnt http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp865-8x8.fnt http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp866-8x8.fnt -http://packages.debian.org/en/etch/console-data/gr737-8x8.psf +http://packages.debian.org/en/etch/all/console-data/ file: gr737-8x8.psf +http://packages.debian.org/en/etch/all/console-data/ file: lat2-08.psf (as a base), remade several + glyphs (by GreatLord), corrected the aligning and cleaned up some of the fonts, finally changed from + ISO to DOS ASCII standard CP852 (by Caemyr) +http://cman.us/files/cp775-8x8.zip Modified: trunk/reactos/media/vgafont/vgafont.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafont/vgafont.bin?… ============================================================================== Binary files - no diff available.

1 0

[cwittich] 32045: add Lithuanian
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 10:35:06 2008 New Revision: 32045 URL: http://svn.reactos.org/svn/reactos?rev=32045&view=rev Log: add Lithuanian Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Wed Jan 30 10:35:06 2008 @@ -114,6 +114,7 @@ 00000410 = "Italian" 00000411 = "Japanese" 00000412 = "Korean" +00000427 = "Lithuanian" 00000414 = "Norwegian" 00000415 = "Polish" 00000816 = "Portuguese"

1 0

[mpiulachs] 32044: Added xcopy to README.WINE
by mpiulachs＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: mpiulachs Date: Wed Jan 30 02:50:54 2008 New Revision: 32044 URL: http://svn.reactos.org/svn/reactos?rev=32044&view=rev Log: Added xcopy to README.WINE Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Jan 30 02:50:54 2008 @@ -101,6 +101,7 @@ reactos/base/applications/games/winemine # Out of sync reactos/base/applications/regedit # Out of sync +reactos/base/applications/cmdutils/xcopy # Synced to Wine-0_9_54 reactos/base/system/expand # Out of sync reactos/base/system/msiexec # Synced to Wine-20080105 reactos/base/applications/winhelp # Synced to Wine-0_9_53

1 0

[mpiulachs] 32043: sync to wine-0.9.54
by mpiulachs＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: mpiulachs Date: Wed Jan 30 02:48:40 2008 New Revision: 32043 URL: http://svn.reactos.org/svn/reactos?rev=32043&view=rev Log: sync to wine-0.9.54 Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c Wed Jan 30 02:48:40 2008 @@ -507,6 +507,7 @@ BOOL copiedFile = FALSE; DWORD destAttribs, srcAttribs; BOOL skipFile; + int ret = 0; /* Allocate some working memory on heap to minimize footprint */ finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); @@ -718,7 +719,8 @@ if (flags & OPT_IGNOREERRORS) { skipFile = TRUE; } else { - return RC_WRITEERROR; + ret = RC_WRITEERROR; + goto cleanup; } } @@ -780,12 +782,14 @@ } } +cleanup: + /* free up memory */ HeapFree(GetProcessHeap(), 0, finddata); HeapFree(GetProcessHeap(), 0, inputpath); HeapFree(GetProcessHeap(), 0, outputpath); - return 0; + return ret; } /* =========================================================================

1 0

[spetreolle] 32042: Added notepad to readme.wine
by spetreolle＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: spetreolle Date: Tue Jan 29 21:02:14 2008 New Revision: 32042 URL: http://svn.reactos.org/svn/reactos?rev=32042&view=rev Log: Added notepad to readme.wine Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Jan 29 21:02:14 2008 @@ -106,6 +106,7 @@ reactos/base/applications/winhelp # Synced to Wine-0_9_53 reactos/base/applications/wordpad # Synced to Wine-0_9_53 reactos/modules/rosapps/winefile # Synced to Wine-0_9_53 +reactos/base/applications/notepad # Forked at Wine-20041201 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[dreimer] 32041: Bug 3014: DLL-Win32-Shellext translation patch by Olaf Sjeka
by dreimer＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: dreimer Date: Tue Jan 29 17:36:49 2008 New Revision: 32041 URL: http://svn.reactos.org/svn/reactos?rev=32041&view=rev Log: Bug 3014: DLL-Win32-Shellext translation patch by Olaf Sjeka Added: trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc (with props) trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc (with props) Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Added: trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc Tue Jan 29 17:36:49 2008 @@ -1,0 +1,54 @@ +/* translated by Caemyr - Olaf Siejka (Jan, 2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Karta GPU" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Typ karty", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&W³aciwoci", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Informacje o karcie", -1, 7, 56, 237, 75 + LTEXT "Typ GPU:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Typ DAC:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Rozmiar pamiêci:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Ci¹g nazwy:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "Wersja BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&Wywietl wszystkie tryby...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Wywietlanie trybów" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Anuluj", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Wywietl tylko obs³ugiwane tryby", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Odwie¿anie domylne" + IDES_REFRESHRATEFMT "%d Herców" + IDS_4BPP "16 kolorów" + IDS_8BPP "256 kolorów" + IDS_15BPP "32k kolorów (15 bitów)" + IDS_16BPP "64k kolorów (16 bitów)" + IDS_24BPP "16m kolorów (24 bity)" + IDS_32BPP "16m +kana³ alfa (32 bity)" +END + Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Tue Jan 29 17:36:49 2008 @@ -7,7 +7,8 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" -#include "lang/it-IT.rc" Added: trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc Tue Jan 29 17:36:49 2008 @@ -1,0 +1,28 @@ +/* translated by Caemyr - Olaf Siejka (Jan, 2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Typ monitora", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&W³aciwoci", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Czêstotliwoæi odwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "U¿yj domylnych ustawieñ sprzêtu" + IDS_FREQFMT "%u Herców" +END Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Tue Jan 29 17:36:49 2008 @@ -7,7 +7,8 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/sk-SK.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/it-IT.rc" -#include "lang/ru-RU.rc"

1 0

[fireball] 32040: - Fix a typo in the if branch, which resulted in marking almost all memory above the bootloader as "FirmwareTemporary", even reserved ACPI pages. This should fix the ACPI BSOD Windows 2003 and XP show up. - If a memory is marked as "free", leave it so, without transferring to FirmwareTemporary.
by fireball＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: fireball Date: Tue Jan 29 13:08:18 2008 New Revision: 32040 URL: http://svn.reactos.org/svn/reactos?rev=32040&view=rev Log: - Fix a typo in the if branch, which resulted in marking almost all memory above the bootloader as "FirmwareTemporary", even reserved ACPI pages. This should fix the ACPI BSOD Windows 2003 and XP show up. - If a memory is marked as "free", leave it so, without transferring to FirmwareTemporary. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Tue Jan 29 13:08:18 2008 @@ -363,9 +363,12 @@ // if (BasePage + PageCount > LOADER_HIGH_ZONE) { - if (Mad[MadCount].MemoryType != LoaderSpecialMemory || - Mad[MadCount].MemoryType != LoaderFirmwarePermanent) - { + if (Mad[MadCount].MemoryType != LoaderSpecialMemory && + Mad[MadCount].MemoryType != LoaderFirmwarePermanent && + Mad[MadCount].MemoryType != LoaderFree) + { + DbgPrint((DPRINT_WINDOWS, "Setting page %x %x to Temporary from %d\n", + BasePage, PageCount, Mad[MadCount].MemoryType)); Mad[MadCount].MemoryType = LoaderFirmwareTemporary; } @@ -466,7 +469,7 @@ // 2) Memory descriptors must map *the whole* physical memory // showing any memory above 16/24/32 as FirmwareTemporary // - // 3) Overall memory blocks count must not exceed 30 + // 3) Overall memory blocks count must not exceed 30 (?? why?) // //

1 0

[fireball] 32039: - Fix an incorrect type of memory behind PDE, HAL mapping and kernel segment pagetables. They should be MemoryData. (and change allocation algorithm slightly). - With this change Windows 2003 boots up to the BSOD showing ACPI_BIOS_ERROR.
by fireball＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: fireball Date: Mon Jan 28 21:50:29 2008 New Revision: 32039 URL: http://svn.reactos.org/svn/reactos?rev=32039&view=rev Log: - Fix an incorrect type of memory behind PDE, HAL mapping and kernel segment pagetables. They should be MemoryData. (and change allocation algorithm slightly). - With this change Windows 2003 boots up to the BSOD showing ACPI_BIOS_ERROR. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Mon Jan 28 21:50:29 2008 @@ -129,11 +129,23 @@ // Allocate memory block for all these things: // PDE, HAL mapping page table, physical mapping, kernel mapping - // FIXME: PDE+HAL+KernelPTEs == FirmwarePermanent, Physical PTEs = FirmwareTemporary TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; - Buffer = MmAllocateMemoryWithType(TotalSize, LoaderFirmwarePermanent); - - if (Buffer == NULL) + + // Physical PTEs = FirmwareTemporary + PhysicalPageTablesBuffer = MmAllocateMemoryWithType( + NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); + + // PDE+HAL+KernelPTEs == MemoryData + Buffer = MmAllocateMemoryWithType( + TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); + + if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != + PhysicalPageTablesBuffer) + { + DbgPrint((DPRINT_WINDOWS, "There was a problem allocating two adjacent blocks of memory!")); + } + + if (Buffer == NULL || PhysicalPageTablesBuffer == NULL) { UiMessageBox("Impossible to allocate memory block for page tables!"); return FALSE; @@ -158,12 +170,8 @@ PDE[1023].Valid = 1; PDE[1023].Write = 1; - // Store pointers to the tables for easier access - PhysicalPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; - KernelPageTablesBuffer = PhysicalPageTablesBuffer + NumPageTables*MM_PAGE_SIZE; - - // Mark physical PTE's buffer as FirmwareTemporary - //MmSetMemoryType(KernelPageTablesBuffer, NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); + // Store pointer to the table for easier access + KernelPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; // Zero counters of page tables used PhysicalPageTables = 0;

1 0

[spetreolle] 32038: forgot that one
by spetreolle＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: spetreolle Date: Mon Jan 28 21:05:54 2008 New Revision: 32038 URL: http://svn.reactos.org/svn/reactos?rev=32038&view=rev Log: forgot that one Modified: trunk/reactos/base/applications/wordpad/print.c Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c (original) +++ trunk/reactos/base/applications/wordpad/print.c Mon Jan 28 21:05:54 2008 @@ -185,7 +185,7 @@ if(wordWrap == ID_WORDWRAP_MARGIN) { RECT rc = get_print_rect(hdc); - width = rc.right; + width = rc.right - rc.left; } if(!hdc)

1 0

[spetreolle] 32037: apply missing part of wordpad manual winesync
by spetreolle＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: spetreolle Date: Mon Jan 28 20:51:00 2008 New Revision: 32037 URL: http://svn.reactos.org/svn/reactos?rev=32037&view=rev Log: apply missing part of wordpad manual winesync Modified: trunk/reactos/base/applications/wordpad/print.c Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c (original) +++ trunk/reactos/base/applications/wordpad/print.c Mon Jan 28 20:51:00 2008 @@ -1,7 +1,7 @@ /* * Wordpad implementation - Printing and print preview functions * - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * Copyright 2007-2008 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -130,23 +130,23 @@ static LONG twips_to_centmm(int twips) { - return MulDiv(twips, 1000, 567); + return MulDiv(twips, 1000, TWIPS_PER_CM); } LONG centmm_to_twips(int mm) { - return MulDiv(mm, 567, 1000); + return MulDiv(mm, TWIPS_PER_CM, 1000); } static LONG twips_to_pixels(int twips, int dpi) { - float ret = ((float)twips / ((float)567 * 2.54)) * (float)dpi; + float ret = ((float)twips / ((float)TWIPS_PER_CM * 2.54)) * (float)dpi; return (LONG)ret; } static LONG devunits_to_twips(int units, int dpi) { - float ret = ((float)units / (float)dpi) * (float)567 * 2.54; + float ret = ((float)units / (float)dpi) * (float)TWIPS_PER_CM * 2.54; return (LONG)ret; } @@ -252,6 +252,25 @@ fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); } +} + +static HWND get_ruler_wnd(HWND hMainWnd) +{ + return GetDlgItem(GetDlgItem(hMainWnd, IDC_REBAR), IDC_RULER); +} + +void redraw_ruler(HWND hRulerWnd) +{ + RECT rc; + + GetClientRect(hRulerWnd, &rc); + InvalidateRect(hRulerWnd, &rc, TRUE); +} + +static void update_ruler(HWND hRulerWnd) +{ + SendMessageW(hRulerWnd, WM_USER, 0, 0); + redraw_ruler(hRulerWnd); } static void print(LPPRINTDLGW pd, LPWSTR wszFileName) @@ -340,6 +359,7 @@ margins.bottom = centmm_to_twips(ps.rtMargin.bottom); devMode = ps.hDevMode; devNames = ps.hDevNames; + update_ruler(get_ruler_wnd(hMainWnd)); } } @@ -394,6 +414,7 @@ devMode = pd.hDevMode; devNames = pd.hDevNames; print(&pd, wszFileName); + update_ruler(get_ruler_wnd(hMainWnd)); } } @@ -454,6 +475,145 @@ BOOL preview_isactive(void) { return preview.page != 0; +} + +static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long EditLeftmost) +{ + static HDC hdc; + + if(NewMetrics) + { + static HBITMAP hBitmap; + int i, x, y, RulerTextEnd; + int CmPixels; + int QuarterCmPixels; + HFONT hFont; + WCHAR FontName[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; + + if(hdc) + { + DeleteDC(hdc); + DeleteObject(hBitmap); + } + + hdc = CreateCompatibleDC(hdc); + + CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX)); + QuarterCmPixels = (int)((float)CmPixels / 4.0); + + hBitmap = CreateCompatibleBitmap(hdc, drawRect->right, drawRect->bottom); + SelectObject(hdc, hBitmap); + FillRect(hdc, drawRect, GetStockObject(WHITE_BRUSH)); + + hFont = CreateFontW(10, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FontName); + + SelectObject(hdc, hFont); + SetBkMode(hdc, TRANSPARENT); + SetTextAlign(hdc, TA_CENTER); + y = (int)(((float)drawRect->bottom - (float)drawRect->top) / 2.0) + 1; + RulerTextEnd = drawRect->right - EditLeftmost + 1; + for(i = 1, x = EditLeftmost; x < (drawRect->right - EditLeftmost + 1); i ++) + { + WCHAR str[3]; + WCHAR format[] = {'%','d',0}; + int x2 = x; + + x2 += QuarterCmPixels; + if(x2 > RulerTextEnd) + break; + + MoveToEx(hdc, x2, y, NULL); + LineTo(hdc, x2, y+2); + + x2 += QuarterCmPixels; + if(x2 > RulerTextEnd) + break; + + MoveToEx(hdc, x2, y - 3, NULL); + LineTo(hdc, x2, y + 3); + + x2 += QuarterCmPixels; + if(x2 > RulerTextEnd) + break; + + MoveToEx(hdc, x2, y, NULL); + LineTo(hdc, x2, y+2); + + x += CmPixels; + if(x > RulerTextEnd) + break; + + wsprintfW(str, format, i); + TextOutW(hdc, x, 5, str, lstrlenW(str)); + } + DeleteObject(hFont); + } + + BitBlt(hdcRuler, 0, 0, drawRect->right, drawRect->bottom, hdc, 0, 0, SRCAND); +} + +static void paint_ruler(HWND hWnd, long EditLeftmost, BOOL NewMetrics) +{ + PAINTSTRUCT ps; + HDC hdc = BeginPaint(hWnd, &ps); + HDC hdcPrint = make_dc(); + RECT printRect = get_print_rect(hdcPrint); + RECT drawRect; + HBRUSH hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); + + GetClientRect(hWnd, &drawRect); + FillRect(hdc, &drawRect, hBrush); + + drawRect.top += 3; + drawRect.bottom -= 3; + drawRect.left = EditLeftmost; + drawRect.right = twips_to_pixels(printRect.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); + FillRect(hdc, &drawRect, GetStockObject(WHITE_BRUSH)); + + drawRect.top--; + drawRect.bottom++; + DrawEdge(hdc, &drawRect, EDGE_SUNKEN, BF_RECT); + + drawRect.left = drawRect.right - 1; + drawRect.right = twips_to_pixels(printRect.right + margins.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); + DrawEdge(hdc, &drawRect, EDGE_ETCHED, BF_RECT); + + drawRect.left = 0; + drawRect.top = 0; + add_ruler_units(hdc, &drawRect, NewMetrics, EditLeftmost); + + SelectObject(hdc, GetStockObject(BLACK_BRUSH)); + DeleteObject(hBrush); + DeleteDC(hdcPrint); + EndPaint(hWnd, &ps); +} + +LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static WNDPROC pPrevRulerProc; + static long EditLeftmost; + static BOOL NewMetrics; + + switch(msg) + { + case WM_USER: + if(wParam) + { + EditLeftmost = ((POINTL*)wParam)->x; + pPrevRulerProc = (WNDPROC)lParam; + } + NewMetrics = TRUE; + break; + + case WM_PAINT: + paint_ruler(hWnd, EditLeftmost, NewMetrics); + break; + + default: + return CallWindowProcW(pPrevRulerProc, hWnd, msg, wParam, lParam); + } + + return 0; } LRESULT print_preview(HWND hMainWnd)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs