Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 05:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Synced to Wine-1.7.9.

Browse source 
svn path=/trunk/; revision=61422
This commit is contained in:
James Tabor 2013-12-26 06:34:56 +00:00
parent 3c03b26a4f
commit 1fce6b4441
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/wordpad/print.c
View file

@ -1146,7 +1146,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
POINT pt; POINT pt;
RECT rc; RECT rc;
int bHittest = FALSE; int bHittest = 0;
DWORD messagePos = GetMessagePos(); DWORD messagePos = GetMessagePos();
pt.x = (short)LOWORD(messagePos); pt.x = (short)LOWORD(messagePos);
pt.y = (short)HIWORD(messagePos); pt.y = (short)HIWORD(messagePos);

10
reactos/base/applications/wordpad/wordpad.c
View file

@ -573,7 +573,7 @@ static void dialog_choose_font(void)
cf.lStructSize = sizeof(cf); cf.lStructSize = sizeof(cf);
cf.hwndOwner = hMainWnd; cf.hwndOwner = hMainWnd;
cf.lpLogFont = &lf; cf.lpLogFont = &lf;
cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS; cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS | CF_NOVERTFONTS;
ZeroMemory(&fmt, sizeof(fmt)); ZeroMemory(&fmt, sizeof(fmt));
fmt.cbSize = sizeof(fmt); fmt.cbSize = sizeof(fmt);
@ -616,6 +616,8 @@ static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lp
{ {
HWND hListWnd = (HWND) lParam; HWND hListWnd = (HWND) lParam;
if (lpelfe->lfFaceName[0] == '@') return 1; /* ignore vertical fonts */
if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR)
{ {
@ -1149,7 +1151,7 @@ static void dialog_viewproperties(void)
static void HandleCommandLine(LPWSTR cmdline) static void HandleCommandLine(LPWSTR cmdline)
{ {
WCHAR delimiter; WCHAR delimiter;
int opt_print = 0; BOOL opt_print = FALSE;
/* skip white space */ /* skip white space */
while (*cmdline == ' ') cmdline++; while (*cmdline == ' ') cmdline++;
@ -1173,7 +1175,7 @@ static void HandleCommandLine(LPWSTR cmdline)
{ {
case 'P': case 'P':
case 'p': case 'p':
opt_print = 1; opt_print = TRUE;
cmdline += 2; cmdline += 2;
continue; continue;
} }
@ -2011,7 +2013,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
on_fontlist_modified(endEdit->szText); on_fontlist_modified(endEdit->szText);
} else if (pHdr->hwndFrom == hwndSizeList) } else if (pHdr->hwndFrom == hwndSizeList)
{ {
on_sizelist_modified(hwndFontList,endEdit->szText); on_sizelist_modified(hwndSizeList,endEdit->szText);
} }
} }
return 0; return 0;

2
reactos/media/doc/README.WINE
View file

@ -236,7 +236,7 @@ reactos/base/applications/iexplore # Synced to Wine-1.7.1
reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/notepad # Forked at Wine-20041201
reactos/base/applications/regedit # Out of sync reactos/base/applications/regedit # Out of sync
reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 reactos/base/applications/winhlp32 # Synced to Wine-1.5.26
reactos/base/applications/wordpad # Synced to Wine-1.5.26 reactos/base/applications/wordpad # Synced to Wine-1.7.9
reactos/base/services/rpcss # Synced to Wine-1.7.1 reactos/base/services/rpcss # Synced to Wine-1.7.1
reactos/base/system/expand # Synced to Wine-1.7.1 reactos/base/system/expand # Synced to Wine-1.7.1
reactos/base/system/msiexec # Synced to Wine-1.7.1 reactos/base/system/msiexec # Synced to Wine-1.7.1