October 2012 - Wine-commits

Daniel Lehman : msvcp: Sync istream<>::seekg implementations.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: bc62a7a9dbc689006c5ed2bace9be57a69324479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc62a7a9dbc689006c5ed2bac… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 25 10:01:12 2012 -0700 msvcp: Sync istream<>::seekg implementations. --- dlls/msvcp100/ios.c | 107 ++++++++++++++++++++++---------------------------- dlls/msvcp60/ios.c | 107 ++++++++++++++++++++++---------------------------- dlls/msvcp71/ios.c | 107 ++++++++++++++++++++++---------------------------- 3 files changed, 141 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc62a7a9dbc689006c5ed…

1 0

Nikolay Sivov : dwrite: Layout can't be created without text format.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: fcae48a08cffec0c7af37f8fe519b0b8c5821208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcae48a08cffec0c7af37f8fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 26 12:10:47 2012 -0400 dwrite: Layout can't be created without text format. --- dlls/dwrite/layout.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 153716b..76c5adb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -681,14 +681,11 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma memset(&This->format, 0, sizeof(This->format)); /* reference is not kept here, instead copy all underlying data */ - if (format) - { - IDWriteTextFormat_GetFontCollection(format, &This->format.collection); - This->format.weight = IDWriteTextFormat_GetFontWeight(format); - This->format.style = IDWriteTextFormat_GetFontStyle(format); - This->format.stretch = IDWriteTextFormat_GetFontStretch(format); - This->format.size = IDWriteTextFormat_GetFontSize(format); - } + IDWriteTextFormat_GetFontCollection(format, &This->format.collection); + This->format.weight = IDWriteTextFormat_GetFontWeight(format); + This->format.style = IDWriteTextFormat_GetFontStyle(format); + This->format.stretch = IDWriteTextFormat_GetFontStretch(format); + This->format.size = IDWriteTextFormat_GetFontSize(format); *layout = &This->IDWriteTextLayout_iface;

1 0

Nikolay Sivov : dwrite: Added GetLocaleNameLength/ GetLocaleName for text format and layout.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 51d0f61272cc2aeb3cc0aba2653174caa7dba8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d0f61272cc2aeb3cc0aba26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 26 12:50:12 2012 -0400 dwrite: Added GetLocaleNameLength/GetLocaleName for text format and layout. --- dlls/dwrite/layout.c | 35 +++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 76c5adb..f6bc421 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textformat_data { WCHAR *family_name; WCHAR *locale; + UINT32 locale_len; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; @@ -114,6 +115,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) if (!ref) { + release_format_data(&This->format); heap_free(This->str); heap_free(This); } @@ -289,15 +291,19 @@ static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout *iface) static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.locale_len; } static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.locale_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.locale); + return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout *iface, FLOAT maxWidth) @@ -668,6 +674,7 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; + UINT32 locale_len; *layout = NULL; @@ -682,6 +689,13 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma /* reference is not kept here, instead copy all underlying data */ IDWriteTextFormat_GetFontCollection(format, &This->format.collection); + + /* locale name and length */ + locale_len = IDWriteTextFormat_GetLocaleNameLength(format); + This->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetLocaleName(format, This->format.locale, locale_len+1); + This->format.locale_len = locale_len; + This->format.weight = IDWriteTextFormat_GetFontWeight(format); This->format.style = IDWriteTextFormat_GetFontStyle(format); This->format.stretch = IDWriteTextFormat_GetFontStretch(format); @@ -908,15 +922,19 @@ static FLOAT WINAPI dwritetextformat_GetFontSize(IDWriteTextFormat *iface) static UINT32 WINAPI dwritetextformat_GetLocaleNameLength(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.locale_len; } static HRESULT WINAPI dwritetextformat_GetLocaleName(IDWriteTextFormat *iface, WCHAR *name, UINT32 size) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.locale_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.locale); + return S_OK; } static const IDWriteTextFormatVtbl dwritetextformatvtbl = { @@ -964,6 +982,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->ref = 1; This->format.family_name = heap_strdupW(family_name); This->format.locale = heap_strdupW(locale); + This->format.locale_len = strlenW(locale); This->format.weight = weight; This->format.style = style; This->format.size = size; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6b8dc62..9656ba6 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -134,6 +134,41 @@ if (0) /* crashes on native */ IDWriteTextFormat_Release(format); } +static void test_GetLocaleName(void) +{ + static const WCHAR strW[] = {'s','t','r','i','n','g',0}; + static const WCHAR ruW[] = {'r','u',0}; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + WCHAR buff[10]; + UINT32 len; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = IDWriteTextLayout_GetLocaleNameLength(layout); + ok(len == 2, "got %u\n", len); + len = IDWriteTextFormat_GetLocaleNameLength(format); + ok(len == 2, "got %u\n", len); + hr = IDWriteTextLayout_GetLocaleName(layout, buff, len); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_GetLocaleName(layout, buff, len+1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); + hr = IDWriteTextFormat_GetLocaleName(format, buff, len); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_GetLocaleName(format, buff, len+1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -149,6 +184,7 @@ START_TEST(layout) test_CreateTextLayout(); test_CreateGdiCompatibleTextLayout(); test_CreateTextFormat(); + test_GetLocaleName(); IDWriteFactory_Release(factory); }

1 0

Jörg Höhle : mciseq: Fix some MCIERROR_* codes ( MCI_STATUS).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 3c640b8df9994d7505b433049563c393f72483cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c640b8df9994d7505b433049… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Sep 16 01:07:12 2012 +0200 mciseq: Fix some MCIERROR_* codes (MCI_STATUS). --- dlls/mciseq/mcimidi.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index abea412..7fbbafb 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1331,13 +1331,14 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS case MCI_STATUS_LENGTH: if ((dwFlags & MCI_TRACK) && wmm->wFormat == 2) { if (lpParms->dwTrack >= wmm->nTracks) - return MCIERR_BAD_INTEGER; + return MCIERR_OUTOFRANGE; /* FIXME: this is wrong if there is a tempo change inside the file */ lpParms->dwReturn = MIDI_ConvertPulseToMS(wmm, wmm->tracks[lpParms->dwTrack].dwLength); } else { lpParms->dwReturn = MIDI_GetMThdLengthMS(wmm); } lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, lpParms->dwReturn); + /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: @@ -1355,9 +1356,10 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: - /* FIXME: do I need to use MCI_TRACK ? */ + /* FIXME: check MCI_TRACK == 1 if set */ lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, (dwFlags & MCI_STATUS_START) ? 0 : wmm->dwPositionMS); + /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ TRACE("MCI_STATUS_POSITION %s => %lu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; @@ -1375,7 +1377,7 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS case MCI_SEQ_STATUS_DIVTYPE: TRACE("MCI_SEQ_STATUS_DIVTYPE !\n"); if (wmm->nDivision > 0x8000) { - switch (wmm->nDivision) { + switch (HIBYTE(wmm->nDivision)) { case 0xE8: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_24; break; /* -24 */ case 0xE7: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_25; break; /* -25 */ case 0xE3: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_30DROP; break; /* -29 */ /* is the MCI constant correct ? */ @@ -1390,11 +1392,13 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS break; case MCI_SEQ_STATUS_MASTER: TRACE("MCI_SEQ_STATUS_MASTER !\n"); - lpParms->dwReturn = 0; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_SEQ_NONE, MCI_SEQ_NONE_S); + ret = MCI_RESOURCE_RETURNED; break; case MCI_SEQ_STATUS_SLAVE: TRACE("MCI_SEQ_STATUS_SLAVE !\n"); - lpParms->dwReturn = 0; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_SEQ_FILE, MCI_SEQ_FILE_S); + ret = MCI_RESOURCE_RETURNED; break; case MCI_SEQ_STATUS_OFFSET: TRACE("MCI_SEQ_STATUS_OFFSET !\n"); @@ -1415,11 +1419,10 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS break; default: FIXME("Unknown command %08X !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_UNSUPPORTED_FUNCTION; } } else { - WARN("No Status-Item!\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_MISSING_PARAMETER; } if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL);

1 0

Jörg Höhle : mciseq: Fix reading MCI_INFO_NAME and COPYRIGHT from MIDI file.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 4c4a0875dab7b125ba015a7cb84395eee4d28128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a0875dab7b125ba015a7cb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 19 22:26:17 2012 +0200 mciseq: Fix reading MCI_INFO_NAME and COPYRIGHT from MIDI file. --- dlls/mciseq/mcimidi.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 7fbbafb..49435c8 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -347,10 +347,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) switch (LOWORD(mmt->dwEventData)) { case 0x02FF: case 0x03FF: - /* position after meta data header */ - mmioSeek(wmm->hFile, mmt->dwIndex + HIWORD(mmt->dwEventData), SEEK_SET); len = mmt->wEventLength - HIWORD(mmt->dwEventData); - if (len >= sizeof(buf)) { WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; @@ -361,20 +358,20 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) case 0x02: if (wmm->lpstrCopyright) { WARN("Two copyright notices (%s|%s)\n", debugstr_w(wmm->lpstrCopyright), buf); - } else { - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); + HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); } + len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); + wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); break; case 0x03: if (wmm->lpstrName) { WARN("Two names (%s|%s)\n", debugstr_w(wmm->lpstrName), buf); - } else { - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); - } + HeapFree(GetProcessHeap(), 0, wmm->lpstrName); + } /* last name or name from last track wins */ + len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); + wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); break; } } @@ -1524,7 +1521,7 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp case MCI_INFO_NAME: str = wmm->lpstrName; break; default: WARN("Don't know this info command (%u)\n", dwFlags); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_MISSING_PARAMETER; /* not MCIERR_FLAGS_... */ } if (!ret) { if (lpParms->dwRetSize) {

1 0

Jörg Höhle : mciseq: The code can only handle up to 128 MIDI tracks.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: c347af5c6743a20c8aeeaf6540c27300ff2484f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c347af5c6743a20c8aeeaf654… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 26 09:04:39 2012 +0200 mciseq: The code can only handle up to 128 MIDI tracks. --- dlls/mciseq/mcimidi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 49435c8..4fcfb48 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -488,10 +488,10 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) return MCIERR_INVALID_FILE; } - if (wmm->nTracks & 0x8000) { - /* this shouldn't be a problem... */ - WARN("Ouch !! Implementation limitation to 32k tracks per MIDI file is overflowed\n"); - wmm->nTracks = 0x7FFF; + if (wmm->nTracks > 0x80) { + /* wTrackNr is 7 bits only */ + FIXME("Truncating MIDI file with %u tracks\n", wmm->nTracks); + wmm->nTracks = 0x80; } if ((wmm->tracks = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_MIDITRACK) * wmm->nTracks)) == NULL) {

1 0

Alexandre Julliard : winex11: Ignore WM_PAINT for layered system tray icons .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 0eef9075f3ebe4d05e700e20950c817bf1ca423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef9075f3ebe4d05e700e209… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 25 11:53:57 2012 +0200 winex11: Ignore WM_PAINT for layered system tray icons. --- dlls/winex11.drv/systray.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 5f0791e..a694610 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -462,6 +462,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; case WM_PAINT: + if (!icon->layered) { PAINTSTRUCT ps; RECT rc; @@ -477,6 +478,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR EndPaint(hwnd, &ps); return 0; } + break; case WM_MOUSEMOVE: case WM_LBUTTONDOWN:

1 0

Alexandre Julliard : gdi32: Fix mapping of symbol font glyphs even when no encoding is specified.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 86abd84167a4b04fdcd319b1d436a8229841bb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86abd84167a4b04fdcd319b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 25 11:54:33 2012 +0200 gdi32: Fix mapping of symbol font glyphs even when no encoding is specified. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b22fb52..81ba8a3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5580,7 +5580,12 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) if (codepage_sets_default_used(font->codepage)) default_used_pointer = &default_used; if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) - ret = 0; + { + if (font->codepage == CP_SYMBOL && wc < 0x100) + ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)wc); + else + ret = 0; + } else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used);

1 0

Daniel Lehman : msvcp90: Set state at end of istream<>::ignore.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 7fa823e5fa39b53180378613cca3b1351c395898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa823e5fa39b53180378613c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 08:18:14 2012 -0700 msvcp90: Set state at end of istream<>::ignore. --- dlls/msvcp90/ios.c | 32 +++++++++++++----- dlls/msvcp90/tests/ios.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 173ef84..9b0cb24 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7500,7 +7500,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7508,22 +7509,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8759,6 +8766,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8766,22 +8774,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index dadc63d..b85662f 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -355,11 +355,13 @@ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_ static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); +static basic_istream_char* (*__thiscall p_basic_istream_char_ignore)(basic_istream_char*, streamsize, int); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_uint64)(basic_istream_wchar*, unsigned __int64*); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_double)(basic_istream_wchar*, double *); static int (*__thiscall p_basic_istream_wchar_get)(basic_istream_wchar*); static MSVCP_bool (*__thiscall p_basic_istream_wchar_ipfx)(basic_istream_wchar*, MSVCP_bool); +static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_ignore)(basic_istream_wchar*, streamsize, unsigned short); /* ostream */ static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); @@ -518,6 +520,8 @@ static BOOL init(void) "?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ"); SET(p_basic_istream_char_ipfx, "?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAA_N_N(a)Z"); + SET(p_basic_istream_char_ignore, + "?ignore@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JH@Z"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)AEA_K@Z"); @@ -527,6 +531,8 @@ static BOOL init(void) "?get@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ"); SET(p_basic_istream_wchar_ipfx, "?ipfx@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA_N_N(a)Z"); + SET(p_basic_istream_wchar_ignore, + "?ignore@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)_JG@Z"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z"); @@ -594,6 +600,8 @@ static BOOL init(void) "?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ"); SET(p_basic_istream_char_ipfx, "?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE_N_N(a)Z"); + SET(p_basic_istream_char_ignore, + "?ignore@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)HH@Z"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)AA_K@Z"); @@ -603,6 +611,8 @@ static BOOL init(void) "?get@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ"); SET(p_basic_istream_wchar_ipfx, "?ipfx@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAE_N_N(a)Z"); + SET(p_basic_istream_wchar_ignore, + "?ignore@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)HG@Z"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z"); @@ -1124,6 +1134,74 @@ static void test_istream_ipfx(void) } +static void test_istream_ignore(void) +{ + unsigned short testus, nextus; + basic_stringstream_wchar wss; + basic_stringstream_char ss; + basic_string_wchar wstr; + basic_string_char str; + IOSB_iostate state; + wchar_t wide[64]; + int i, next; + + struct _test_istream_ignore { + const char *str; + streamsize count; + int delim; + IOSB_iostate state; + int next; + } tests[] = { + /* string count delim state next */ + { "", 0, '\n', IOSTATE_goodbit, EOF }, /* empty string */ + + /* different counts */ + { "ABCDEF", 2, '\n', IOSTATE_goodbit, 'C' }, /* easy case */ + { "ABCDEF", 42, '\n', IOSTATE_eofbit, EOF }, /* ignore too much */ + { "ABCDEF", -2, '\n', IOSTATE_goodbit, 'A' }, /* negative count */ + { "ABCDEF", 6, '\n', IOSTATE_goodbit, EOF }, /* is eof not set at end */ + { "ABCDEF", 7, '\n', IOSTATE_eofbit, EOF }, /* eof is set just after end */ + + /* different delimiters */ + { "ABCDEF", 42, '\0', IOSTATE_eofbit, EOF }, /* null as delim */ + { "ABC DEF GHI", 0, ' ', IOSTATE_goodbit, 'A' }, + { "ABC DEF GHI", 42, ' ', IOSTATE_goodbit, 'D' }, + { "ABC DEF\tGHI", 42, '\t', IOSTATE_goodbit, 'G' }, + { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + /* char version */ + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); + + call_func3(p_basic_istream_char_ignore, &ss.base.base1, tests[i].count, tests[i].delim); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); + next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + + /* wchar_t version */ + AtoW(wide, tests[i].str, strlen(tests[i].str)); + call_func2(p_basic_string_wchar_ctor_cstr, &wstr, wide); + call_func4(p_basic_stringstream_wchar_ctor_str, &wss, &wstr, OPENMODE_out|OPENMODE_in, TRUE); + + call_func3(p_basic_istream_wchar_ignore, &wss.base.base1, tests[i].count, tests[i].delim); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); + nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; + ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus); + + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); + } +} + + START_TEST(ios) { if(!init()) @@ -1133,6 +1211,7 @@ START_TEST(ios) test_num_get_get_double(); test_num_put_put_double(); test_istream_ipfx(); + test_istream_ignore(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Daniel Lehman : msvcp: Sync istream<>::_ignore.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: c9a505258f146d6e95ceb8e68511f4a7f4a42bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a505258f146d6e95ceb8e68… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 24 13:47:05 2012 -0700 msvcp: Sync istream<>::_ignore. --- dlls/msvcp100/ios.c | 30 ++++++++++++++++++++++-------- dlls/msvcp60/ios.c | 32 +++++++++++++++++++++++--------- dlls/msvcp71/ios.c | 32 +++++++++++++++++++++++--------- 3 files changed, 68 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 9583ae1..83a2c3a 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -5747,6 +5747,7 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi { basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(count), delim); @@ -5754,22 +5755,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==(unsigned char)delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -6871,6 +6878,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(count), delim); @@ -6878,22 +6886,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 48de106..82015547 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7137,7 +7137,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7145,22 +7146,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8389,6 +8396,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8396,22 +8404,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 148f2c8..34404b5 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7469,7 +7469,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7477,22 +7478,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8724,6 +8731,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8731,22 +8739,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; }

1 0