wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Alexandre Julliard : wordpad: Don't offer vertical fonts in the font dialog .
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: fb6b0f93c2493aed23d17c27c05b7f64c7c66702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6b0f93c2493aed23d17c27c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:41 2013 +0200 wordpad: Don't offer vertical fonts in the font dialog. --- programs/wordpad/wordpad.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8a2afc4..8468148 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -576,7 +576,7 @@ static void dialog_choose_font(void) cf.lStructSize = sizeof(cf); cf.hwndOwner = hMainWnd; 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)); fmt.cbSize = sizeof(fmt); @@ -619,6 +619,8 @@ static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lp { HWND hListWnd = (HWND) lParam; + if (lpelfe->lfFaceName[0] == '@') return 1; /* ignore vertical fonts */ + if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) {

1 0

Alexandre Julliard : winefile: Don' t offer vertical fonts in the font dialog.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 2f7a7caa92cea98490041d843f9c963239fd43f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7a7caa92cea98490041d843… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:37 2013 +0200 winefile: Don't offer vertical fonts in the font dialog. --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 11fddab..3b30255 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -245,7 +245,7 @@ static inline void choose_font(HWND hwnd) chFont.hwndOwner = hwnd; chFont.hDC = NULL; chFont.lpLogFont = &lFont; - chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT; + chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_NOVERTFONTS; chFont.rgbColors = RGB(0,0,0); chFont.lCustData = 0; chFont.lpfnHook = NULL;

1 0

Alexandre Julliard : wineconsole: Don' t offer vertical fonts in the font dialog.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: ed853f93d40d342cc8cf33f7fe61a9739f36d294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed853f93d40d342cc8cf33f7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 18:07:24 2013 +0200 wineconsole: Don't offer vertical fonts in the font dialog. --- programs/wineconsole/user.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 9b8ad15..5c8c2c0 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -357,6 +357,7 @@ BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf) { return (lf->lfPitchAndFamily & 3) == FIXED_PITCH && /* (lf->lfPitchAndFamily & 0xF0) == FF_MODERN && */ + lf->lfFaceName[0] != '@' && (lf->lfCharSet == DEFAULT_CHARSET || lf->lfCharSet == g_uiDefaultCharset); }

1 0

Alexandre Julliard : winecfg: Don't offer vertical fonts in the font dialog .
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: b07fb96a233b9ab9c217d1ca06fdea55e99e627f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07fb96a233b9ab9c217d1ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:32 2013 +0200 winecfg: Don't offer vertical fonts in the font dialog. --- programs/winecfg/theme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 98faf51..be57037 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1106,7 +1106,7 @@ static void on_select_font(HWND hDlg) cf.lStructSize = sizeof(CHOOSEFONTW); cf.hwndOwner = hDlg; cf.lpLogFont = &(metrics[index].lf); - cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL; + cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL | CF_NOVERTFONTS; ChooseFontW(&cf); }

1 0

Alexandre Julliard : notepad: Don't offer vertical fonts in the font dialog .
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 276306e227c2b56b51b759c275dbd5d23a1cfe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=276306e227c2b56b51b759c27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:26 2013 +0200 notepad: Don't offer vertical fonts in the font dialog. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 5878da8..1ea2ef9 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -1118,7 +1118,7 @@ VOID DIALOG_SelectFont(VOID) cf.lStructSize=sizeof(cf); cf.hwndOwner=Globals.hMainWnd; cf.lpLogFont=&lf; - cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; + cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOVERTFONTS; if( ChooseFontW(&cf) ) {

1 0

Alexandre Julliard : clock: Don't offer vertical fonts in the font dialog.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 2088c36c19f3a4e4fa7ea8612640e05e305a8089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2088c36c19f3a4e4fa7ea8612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:22 2013 +0200 clock: Don't offer vertical fonts in the font dialog. --- programs/clock/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 048b1aa..04bfe64 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -144,7 +144,7 @@ static VOID CLOCK_ChooseFont(VOID) cf.lStructSize = sizeof(cf); cf.hwndOwner = Globals.hMainWnd; cf.lpLogFont = &lf; - cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; + cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOVERTFONTS; if (ChooseFontW(&cf)) { Globals.logfont = lf; CLOCK_ResetFont();

1 0

Qian Hong : msctf: Added stub TF_CreateLangBarItemMgr.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 0c46b06c9857cb1c8d3d57d36eeb8a7fdb4947c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c46b06c9857cb1c8d3d57d36… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 25 16:15:34 2013 +0800 msctf: Added stub TF_CreateLangBarItemMgr. --- dlls/msctf/msctf.c | 8 ++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 0d4bd84..2a8b0e1 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -651,3 +651,11 @@ HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm) TRACE("\n"); return LangBarMgr_Constructor(NULL,(IUnknown**)pppbm); } + +HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim) +{ + FIXME("stub %p\n", pplbim); + *pplbim = NULL; + + return E_NOTIMPL; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index 387af57..4dbfb92 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -12,7 +12,7 @@ @ stub TF_CreateCicLoadMutex @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) -@ stub TF_CreateLangBarItemMgr +@ stdcall TF_CreateLangBarItemMgr(ptr) @ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther

1 0

Alexandre Julliard : comdlg32: Add support for the CF_NOVERTFONTS flag.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 90ca8eb21e0c1098a484351d85d8903be5b699b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ca8eb21e0c1098a484351d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:38:52 2013 +0200 comdlg32: Add support for the CF_NOVERTFONTS flag. --- dlls/comdlg32/fontdlg.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index e5b87bf..909f43a 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -221,7 +221,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) if (TRACE_ON(commdlg)) _dump_cf_flags(lpChFont->Flags); - if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS )) + if (lpChFont->Flags & CF_SELECTSCRIPT) FIXME(": unimplemented flag (ignored)\n"); return DialogBoxIndirectParamW(COMDLG32_hInstance, template, @@ -274,7 +274,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) } if (TRACE_ON(commdlg)) _dump_cf_flags(lpChFont->Flags); - if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS )) + if (lpChFont->Flags & CF_SELECTSCRIPT) FIXME(": unimplemented flag (ignored)\n"); return DialogBoxIndirectParamA(COMDLG32_hInstance, template, @@ -325,6 +325,9 @@ static INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * if (lpcf->Flags & CF_TTONLY) if (!(nFontType & TRUETYPE_FONTTYPE)) return 1; + if (lpcf->Flags & CF_NOVERTFONTS) + if (lplf->lfFaceName[0] == '@') + return 1; if (e) e->added++;

1 0

Marcus Meissner : ole32: LeaveCriticalSection in one exit case (Coverity).
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 5ef6f99108874362857525eb5447d5e1cf77a609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef6f99108874362857525eb5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 25 09:59:34 2013 +0200 ole32: LeaveCriticalSection in one exit case (Coverity). --- dlls/ole32/ifs.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 8ec6bd8..35ed04b 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -217,13 +217,16 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { IMallocSpy_Release(Malloc32.pSpy); Malloc32.SpyReleasePending = FALSE; Malloc32.pSpy = NULL; + LeaveCriticalSection(&IMalloc32_SpyCS); } if (0==cb) { - /* PreRealloc can force Realloc to fail */ - LeaveCriticalSection(&IMalloc32_SpyCS); + /* PreRealloc can force Realloc to fail */ + if (Malloc32.pSpy) + LeaveCriticalSection(&IMalloc32_SpyCS); return NULL; } + pv = pRealMemory; }

1 0

Dmitry Timoshkov : kernel32/tests: Add more VirtualAlloc and VirtualProtect tests.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: c69cc5506bd0507c1247311ab58425d97fa21168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69cc5506bd0507c1247311ab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 25 14:43:49 2013 +0900 kernel32/tests: Add more VirtualAlloc and VirtualProtect tests. --- dlls/kernel32/tests/virtual.c | 69 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c0c1a89..521ce6e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1581,7 +1581,7 @@ static void test_VirtualProtect(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1652,6 +1652,27 @@ static void test_VirtualProtect(void) DWORD prot = exec_prot | rw_prot; SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + { + if (prot & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)) + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + { + ok(ptr != NULL, "VirtualAlloc(%02x) error %d\n", prot, GetLastError()); + ok(ptr == base, "expected %p, got %p\n", base, ptr); + } + } + + SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, prot, &old_prot); if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) { @@ -1734,7 +1755,7 @@ static void test_VirtualAlloc_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, i; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1772,6 +1793,10 @@ static void test_VirtualAlloc_protection(void) ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); } + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + ok(ptr == base, "%d: VirtualAlloc failed %d\n", i, GetLastError()); + VirtualFree(base, 0, MEM_FREE); } else @@ -1824,7 +1849,7 @@ static void test_CreateFileMapping_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE, PAGE_NOACCESS }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE, PAGE_NOACCESS } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, i, alloc_prot, prot, old_prot; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1896,6 +1921,27 @@ static void test_CreateFileMapping_protection(void) ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); } + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + /* FIXME: remove once Wine is fixed */ + if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); + else +todo_wine + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); + if (td[i].prot == PAGE_READONLY || td[i].prot == PAGE_WRITECOPY) + ok(ret, "%d: VirtualProtect(%02x) error %d\n", i, td[i].prot, GetLastError()); + else + { + ok(!ret, "%d: VirtualProtect(%02x) should fail\n", i, td[i].prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + UnmapViewOfFile(base); CloseHandle(hmap); } @@ -2196,7 +2242,7 @@ static void test_mapping(void) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE, PAGE_EXECUTE_READWRITE }, /* 0x2e */ { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; - void *base, *nt_base; + void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; SYSTEM_INFO si; char temp_path[MAX_PATH]; @@ -2376,6 +2422,21 @@ static void test_mapping(void) } } + for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) + { + /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); + /* FIXME: remove once Wine is fixed */ + if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); + else +todo_wine + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + UnmapViewOfFile(base); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013