June 2013 - Wine-commits - list.winehq.org

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

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 : 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

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 : 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 : 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 : 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 : 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

Hans Leidekker : ws2_32/tests: Avoid races.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 1d8b70fca4224f324f878b286c3178a313e3aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8b70fca4224f324f878b286… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:10 2013 +0200 ws2_32/tests: Avoid races. --- dlls/ws2_32/tests/sock.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 758fa7e..3e3167a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5468,6 +5468,8 @@ static void test_completion_port(void) ok(iret == SOCKET_ERROR, "WSARecv returned %d\n", iret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + Sleep(100); + closesocket(src); src = INVALID_SOCKET; @@ -5523,6 +5525,9 @@ static void test_completion_port(void) closesocket(src); src = INVALID_SOCKET; + + Sleep(100); + num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -5947,6 +5952,8 @@ static void test_completion_port(void) iret = send(connector, buf, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + Sleep(100); + closesocket(dest); dest = INVALID_SOCKET; @@ -6022,12 +6029,15 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok((GetLastError() == ERROR_NETNAME_DELETED) || (GetLastError() == ERROR_CONNECTION_ABORTED), "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || + GetLastError() == ERROR_OPERATION_ABORTED || + GetLastError() == ERROR_CONNECTION_ABORTED, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && ((olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT) - || (olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED)), "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || + olp->Internal == (ULONG)STATUS_CANCELLED || + olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

Hans Leidekker : dssenh/tests: Fix test failures on 64-bit Vista.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 725797249c0efec82261ecc9ee1bc1c51c6e87f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725797249c0efec82261ecc9e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:39 2013 +0200 dssenh/tests: Fix test failures on 64-bit Vista. --- dlls/dssenh/tests/dssenh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index bf79407..c873787 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1142,6 +1142,7 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Import the public key and convert it into a shared key */ result = CryptImportKey(hProv, pubKeyBuffer2, pubKeyLen2, privKey1, 0, &sessionKey1); ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(!result && GetLastError() == NTE_BAD_DATA) || /* Vista.64 */ broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ broken(!result && GetLastError() == NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */ broken(result), /* WinNT4 */

1 0