winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2015
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
411 discussions
Start a n
N
ew thread
Piotr Caban : winmm: Add RIFF creation tests.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: f6b46db1c7b0e21b4c02deafee2c015a6fbbb4ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6b46db1c7b0e21b4c02deafe…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 20 15:42:19 2015 +0100 winmm: Add RIFF creation tests. --- dlls/winmm/tests/mmio.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index cf02c0d..89146ef 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -906,6 +906,88 @@ static void test_mmio_buffer_pointer(void) DeleteFileA(test_file); } +static void test_riff_write(void) +{ + static const DWORD test_write_data[] = + { + FOURCC_RIFF, 0x28, mmioFOURCC('W','A','V','E'), mmioFOURCC('d','a','t','a'), + 0x1b, 0xdededede, 0xdededede, 0xefefefef, + 0xefefefef, 0xbabababa, 0xbabababa, 0xefefef + }; + + char name[] = "test_write.wav"; + char buf[256]; + MMCKINFO chunk_info[2]; + MMIOINFO info; + HMMIO mmio; + MMRESULT ret; + LONG written; + DWORD read; + HANDLE h; + + memset(chunk_info, 0, sizeof(chunk_info)); + + mmio = mmioOpenA(name, NULL, MMIO_ALLOCBUF|MMIO_CREATE|MMIO_READWRITE); + ok(mmio != NULL, "mmioOpen failed\n"); + + chunk_info[0].fccType = mmioFOURCC('W','A','V','E'); + ret = mmioCreateChunk(mmio, chunk_info, MMIO_CREATERIFF); + ok(ret == MMSYSERR_NOERROR, "mmioCreateChunk failed %x\n", ret); + ok(chunk_info[0].ckid == FOURCC_RIFF, "chunk_info[0].ckid = %x\n", chunk_info[0].ckid); + ok(chunk_info[0].cksize == 0, "chunk_info[0].cksize = %d\n", chunk_info[0].cksize); + ok(chunk_info[0].dwDataOffset == 8, "chunk_info[0].dwDataOffset = %d\n", chunk_info[0].dwDataOffset); + ok(chunk_info[0].dwFlags == MMIO_DIRTY, "chunk_info[0].dwFlags = %x\n", chunk_info[0].dwFlags); + + chunk_info[1].ckid = mmioFOURCC('d','a','t','a'); + ret = mmioCreateChunk(mmio, chunk_info+1, 0); + ok(ret == MMSYSERR_NOERROR, "mmioCreateChunk failed %x\n", ret); + ok(chunk_info[1].ckid == mmioFOURCC('d','a','t','a'), "chunk_info[1].ckid = %x\n", chunk_info[1].ckid); + ok(chunk_info[1].cksize == 0, "chunk_info[1].cksize = %d\n", chunk_info[1].cksize); + ok(chunk_info[1].dwDataOffset == 20, "chunk_info[1].dwDataOffset = %d\n", chunk_info[1].dwDataOffset); + ok(chunk_info[1].dwFlags == MMIO_DIRTY, "chunk_info[1].dwFlags = %x\n", chunk_info[1].dwFlags); + + memset(buf, 0xde, sizeof(buf)); + written = mmioWrite(mmio, buf, 8); + ok(written == 8, "mmioWrite failed %x\n", ret); + + ret = mmioGetInfo(mmio, &info, 0); + ok(ret == MMSYSERR_NOERROR, "mmioGetInfo failed %x\n", ret); + + memset(info.pchNext, 0xef, 8); + info.pchNext += 8; + ret = mmioAdvance(mmio, &info, 1); + ok(ret == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", ret); + ok(info.lBufOffset == 36, "info.lBufOffset = %d\n", info.lBufOffset); + + info.dwFlags |= MMIO_DIRTY; + memset(info.pchNext, 0xba, 8); + info.pchNext += 8; + ret = mmioAdvance(mmio, &info, 1); + ok(ret == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", ret); + ok(info.lBufOffset == 44, "info.lBufOffset = %d\n", info.lBufOffset); + + info.dwFlags |= MMIO_DIRTY; + memset(info.pchNext, 0xef, 3); + info.pchNext += 3; + ret = mmioSetInfo(mmio, &info, 0); + ok(ret == MMSYSERR_NOERROR, "mmioSetInfo failed %x\n", ret); + + ret = mmioAscend(mmio, chunk_info+1, 0); + ok(ret == MMSYSERR_NOERROR, "mmioAscend failed %x\n", ret); + ret = mmioAscend(mmio, chunk_info, 0); + ok(ret == MMSYSERR_NOERROR, "mmioAscend failed %x\n", ret); + ret = mmioClose(mmio, 0); + ok(ret == MMSYSERR_NOERROR, "mmioClose failed %x\n", ret); + + h = CreateFileA("test_write.wav", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(h != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + ok(ReadFile(h, buf, sizeof(buf), &read, NULL), "ReadFile failed\n"); + CloseHandle(h); + ok(!memcmp(buf, test_write_data, sizeof(test_write_data)), "created file is incorrect\n"); + + DeleteFileA("test_write.wav"); +} + START_TEST(mmio) { /* Make it possible to run the tests against a specific AVI file in @@ -924,4 +1006,5 @@ START_TEST(mmio) test_mmioSeek(); test_mmio_end_of_file(); test_mmio_buffer_pointer(); + test_riff_write(); }
1
0
0
0
Piotr Caban : winmm: Save data that was not yet written in mmioSetInfo.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: 860618622e6d397f270005802557b758256970fe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=860618622e6d397f270005802…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 20 15:42:07 2015 +0100 winmm: Save data that was not yet written in mmioSetInfo. --- dlls/winmm/mmio.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 16532bf..ad73564 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -949,25 +949,23 @@ MMRESULT WINAPI mmioGetInfo(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) */ MMRESULT WINAPI mmioSetInfo(HMMIO hmmio, const MMIOINFO* lpmmioinfo, UINT uFlags) { - LPWINE_MMIO wm; + LPWINE_MMIO wm; TRACE("(%p,%p,0x%08x)\n",hmmio,lpmmioinfo,uFlags); if ((wm = MMIO_Get(hmmio)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_INVALHANDLE; /* check pointers coherence */ if (lpmmioinfo->pchNext < wm->info.pchBuffer || - lpmmioinfo->pchNext > wm->info.pchBuffer + wm->info.cchBuffer || - lpmmioinfo->pchEndRead < wm->info.pchBuffer || - lpmmioinfo->pchEndRead > wm->info.pchBuffer + wm->info.cchBuffer || - lpmmioinfo->pchEndWrite < wm->info.pchBuffer || - lpmmioinfo->pchEndWrite > wm->info.pchBuffer + wm->info.cchBuffer) - return MMSYSERR_INVALPARAM; - - wm->info.pchNext = lpmmioinfo->pchNext; - wm->info.pchEndRead = lpmmioinfo->pchEndRead; - + lpmmioinfo->pchNext > wm->info.pchBuffer + wm->info.cchBuffer || + lpmmioinfo->pchEndRead < wm->info.pchBuffer || + lpmmioinfo->pchEndRead > wm->info.pchBuffer + wm->info.cchBuffer || + lpmmioinfo->pchEndWrite < wm->info.pchBuffer || + lpmmioinfo->pchEndWrite > wm->info.pchBuffer + wm->info.cchBuffer) + return MMSYSERR_INVALPARAM; + + wm->info = *lpmmioinfo; return MMSYSERR_NOERROR; }
1
0
0
0
Piotr Caban : winmm: Write user data after headers in mmioAdvance so IDiskOffset is updated correctly.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: 193663e8d848358ac2a5996b95e9333e85345300 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=193663e8d848358ac2a5996b9…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 20 15:41:03 2015 +0100 winmm: Write user data after headers in mmioAdvance so IDiskOffset is updated correctly. --- dlls/winmm/mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index f2a04cf..16532bf 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1023,6 +1023,8 @@ MMRESULT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) if (uFlags != MMIO_READ && uFlags != MMIO_WRITE) return MMSYSERR_INVALPARAM; + if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) + return MMIOERR_CANNOTWRITE; if (uFlags == MMIO_WRITE && (lpmmioinfo->dwFlags & MMIO_DIRTY)) { send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lpmmioinfo->lBufOffset, SEEK_SET, FALSE); @@ -1030,8 +1032,6 @@ MMRESULT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) lpmmioinfo->pchNext - lpmmioinfo->pchBuffer, FALSE); lpmmioinfo->dwFlags &= ~MMIO_DIRTY; } - if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) - return MMIOERR_CANNOTWRITE; if (lpmmioinfo && lpmmioinfo->fccIOProc == FOURCC_DOS) { wm->dwFileSize = max(wm->dwFileSize, lpmmioinfo->lBufOffset +
1
0
0
0
Nikolay Sivov : dwrite/tests: Test default colors of render target memory HDC.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: eb2a4ec5f4c39f90c4febc6d5cac0046017c9b3f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eb2a4ec5f4c39f90c4febc6d5…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 20 13:50:22 2015 +0300 dwrite/tests: Test default colors of render target memory HDC. --- dlls/dwrite/tests/font.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 95ba5aa..532f8df 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -632,6 +632,7 @@ static void test_CreateBitmapRenderTarget(void) HBITMAP hbm, hbm2; DWRITE_MATRIX m; DIBSECTION ds; + COLORREF c; HRESULT hr; FLOAT pdip; SIZE size; @@ -689,6 +690,14 @@ if (0) /* crashes on native */ hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); ok(hdc != NULL, "got %p\n", hdc); + /* test context settings */ + c = GetTextColor(hdc); + ok(c == RGB(0, 0, 0), "got 0x%08x\n", c); + ret = GetBkMode(hdc); + ok(ret == OPAQUE, "got %d\n", ret); + c = GetBkColor(hdc); + ok(c == RGB(255, 255, 255), "got 0x%08x\n", c); + hbm = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm != NULL, "got %p\n", hbm);
1
0
0
0
Nikolay Sivov : dwrite/tests: Fixed font instance leak.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: 0067be66bb3026c173d38a0df762a4bb33b11fa6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0067be66bb3026c173d38a0df…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 20 13:48:37 2015 +0300 dwrite/tests: Fixed font instance leak. --- dlls/dwrite/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d171411..95ba5aa 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2240,6 +2240,7 @@ static void test_GetGdiInterop(void) hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop2, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop2); IDWriteGdiInterop_Release(interop);
1
0
0
0
Nikolay Sivov : dwrite: Use FreeType CMAP cache system instead of parsing tables manually.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: 6ff14a92138ea10f38a29215731d4e63c1acec26 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6ff14a92138ea10f38a292157…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 20 13:47:30 2015 +0300 dwrite: Use FreeType CMAP cache system instead of parsing tables manually. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 9 +--- dlls/dwrite/freetype.c | 26 ++++++++++- dlls/dwrite/opentype.c | 100 ------------------------------------------- 4 files changed, 28 insertions(+), 109 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9a27a5e..9481c74 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -126,7 +126,6 @@ extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; -extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_STRETCH*, DWRITE_FONT_WEIGHT*,DWRITE_FONT_STYLE*) DECLSPEC_HIDDEN; @@ -162,6 +161,7 @@ extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; +extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2092576..12ce3ca 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -388,17 +388,12 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI UINT32 count, UINT16 *glyph_indices) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - unsigned int i; - void *data; + UINT32 i; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); - data = get_fontface_cmap(This); - if (!data) - return E_FAIL; - for (i = 0; i < count; i++) - opentype_cmap_get_glyphindex(data, codepoints[i], &glyph_indices[i]); + glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]); return S_OK; } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3b9681d..84c9cad 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -53,6 +53,7 @@ static CRITICAL_SECTION freetype_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static void *ft_handle = NULL; static FT_Library library = 0; static FTC_Manager cache_manager = 0; +static FTC_CMapCache cmap_cache = 0; typedef struct { FT_Int major; @@ -67,6 +68,8 @@ MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Transform); +MAKE_FUNCPTR(FTC_CMapCache_Lookup); +MAKE_FUNCPTR(FTC_CMapCache_New); MAKE_FUNCPTR(FTC_Manager_New); MAKE_FUNCPTR(FTC_Manager_Done); MAKE_FUNCPTR(FTC_Manager_LookupFace); @@ -137,6 +140,8 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FT_Load_Glyph) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FT_Outline_Transform) + LOAD_FUNCPTR(FTC_CMapCache_Lookup) + LOAD_FUNCPTR(FTC_CMapCache_New) LOAD_FUNCPTR(FTC_Manager_New) LOAD_FUNCPTR(FTC_Manager_Done) LOAD_FUNCPTR(FTC_Manager_LookupFace) @@ -153,8 +158,11 @@ BOOL init_freetype(void) pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); /* init cache manager */ - if (pFTC_Manager_New(library, 0, 0, 0, &face_requester, NULL, &cache_manager) != 0) { + if (pFTC_Manager_New(library, 0, 0, 0, &face_requester, NULL, &cache_manager) != 0 || + pFTC_CMapCache_New(cache_manager, &cmap_cache) != 0) { + ERR("Failed to init FreeType cache\n"); + pFTC_Manager_Done(cache_manager); pFT_Done_FreeType(library); wine_dlclose(ft_handle, NULL, 0); ft_handle = NULL; @@ -388,6 +396,17 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return count; } +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +{ + UINT16 glyph; + + EnterCriticalSection(&freetype_cs); + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, -1, codepoint); + LeaveCriticalSection(&freetype_cs); + + return glyph; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -424,4 +443,9 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return 0; } +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +{ + return 0; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index aabc049..cbc5090 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -757,106 +757,6 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ * CMAP **********/ -static int compare_group(const void *a, const void* b) -{ - const DWORD *chr = a; - const CMAP_SegmentedCoverage_group *group = b; - - if (*chr < GET_BE_DWORD(group->startCharCode)) - return -1; - if (*chr > GET_BE_DWORD(group->endCharCode)) - return 1; - return 0; -} - -static void CMAP4_GetGlyphIndex(CMAP_SegmentMapping_0* format, UINT32 utf32c, UINT16 *pgi) -{ - WORD *startCode; - SHORT *idDelta; - WORD *idRangeOffset; - int segment; - - int segment_count = GET_BE_WORD(format->segCountX2)/2; - /* This is correct because of the padding before startCode */ - startCode = (WORD*)((BYTE*)format + sizeof(CMAP_SegmentMapping_0) + (sizeof(WORD) * segment_count)); - idDelta = (SHORT*)(((BYTE*)startCode) + (sizeof(WORD) * segment_count)); - idRangeOffset = (WORD*)(((BYTE*)idDelta) + (sizeof(WORD) * segment_count)); - - segment = 0; - while(GET_BE_WORD(format->endCode[segment]) < 0xffff) - { - if (utf32c <= GET_BE_WORD(format->endCode[segment])) - break; - segment++; - } - if (segment >= segment_count) - return; - TRACE("Segment %i of %i\n",segment, segment_count); - if (GET_BE_WORD(startCode[segment]) > utf32c) - return; - TRACE("In range %i -> %i\n", GET_BE_WORD(startCode[segment]), GET_BE_WORD(format->endCode[segment])); - if (GET_BE_WORD(idRangeOffset[segment]) == 0) - { - *pgi = (SHORT)(GET_BE_WORD(idDelta[segment])) + utf32c; - } - else - { - WORD ro = GET_BE_WORD(idRangeOffset[segment])/2; - WORD co = (utf32c - GET_BE_WORD(startCode[segment])); - WORD *index = (WORD*)((BYTE*)&idRangeOffset[segment] + (ro + co)); - *pgi = GET_BE_WORD(*index); - } -} - -static void CMAP12_GetGlyphIndex(CMAP_SegmentedCoverage* format, UINT32 utf32c, UINT16 *pgi) -{ - CMAP_SegmentedCoverage_group *group; - - group = bsearch(&utf32c, format->groups, GET_BE_DWORD(format->nGroups), - sizeof(CMAP_SegmentedCoverage_group), compare_group); - - if (group) - { - DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode); - *pgi = GET_BE_DWORD(group->startGlyphID) + offset; - } -} - -void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) -{ - CMAP_Header *CMAP_Table = data; - int i; - - *pgi = 0; - - for (i = 0; i < GET_BE_WORD(CMAP_Table->numTables); i++) - { - WORD type; - WORD *table; - - if (GET_BE_WORD(CMAP_Table->tables[i].platformID) != 3) - continue; - - table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); - type = GET_BE_WORD(*table); - TRACE("table type %i\n", type); - - switch (type) - { - case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: - CMAP4_GetGlyphIndex((CMAP_SegmentMapping_0*) table, utf32c, pgi); - break; - case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: - CMAP12_GetGlyphIndex((CMAP_SegmentedCoverage*) table, utf32c, pgi); - break; - default: - TRACE("table type %i unhandled.\n", type); - } - - if (*pgi) return; - } -} - static UINT32 opentype_cmap_get_unicode_ranges_count(const CMAP_Header *CMAP_Table) { UINT32 count = 0;
1
0
0
0
Jacek Caban : hhctrl.ocx: Store WebBrowser container struct instead of interfaces in HHInfo.
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: efe4be6571eaa68f6433e3e02ac80c720884c67a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=efe4be6571eaa68f6433e3e02…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 20 14:32:49 2015 +0100 hhctrl.ocx: Store WebBrowser container struct instead of interfaces in HHInfo. --- dlls/hhctrl.ocx/help.c | 14 ++-- dlls/hhctrl.ocx/hhctrl.h | 17 +++- dlls/hhctrl.ocx/webbrowser.c | 186 ++++++++++++++++++------------------------- 3 files changed, 97 insertions(+), 120 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=efe4be6571eaa68f6433e…
1
0
0
0
Michael Stefaniuc : d3d8/tests: Test the return value of CreateVolumeTexture (PVS-Studio).
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: dd2dbde6256e16792ff93307dd446cfd21969fe4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dd2dbde6256e16792ff93307d…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:26:14 2015 +0100 d3d8/tests: Test the return value of CreateVolumeTexture (PVS-Studio). --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b75513e..e06b1a3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6125,6 +6125,7 @@ static void test_volume_blocks(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, formats[i].block_width, formats[i].block_height, 2, 2, 0, formats[i].fmt, D3DPOOL_SCRATCH, &texture); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); hr = IDirect3DVolumeTexture8_LockBox(texture, 1, &locked_box, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock volume texture mipmap, hr %#x.\n", hr); hr = IDirect3DVolumeTexture8_UnlockBox(texture, 1); @@ -6727,6 +6728,7 @@ static void test_resource_type(void) { hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &volume_texture); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); type = IDirect3DVolumeTexture8_GetType(volume_texture); ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type);
1
0
0
0
Michael Stefaniuc : appwiz.cpl: Use the proper type to hold the return value (PVS-Studio).
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: c3c272c4c5de5874f008271b78648394bb55fb04 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c3c272c4c5de5874f008271b7…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:23:29 2015 +0100 appwiz.cpl: Use the proper type to hold the return value (PVS-Studio). --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3a7d35d..3704c56 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -307,7 +307,7 @@ static enum install_res install_from_default_dir(void) const char *data_dir, *package_dir; char *dir_buf = NULL; int len; - BOOL ret; + enum install_res ret; if((data_dir = wine_get_data_dir())) { package_dir = data_dir;
1
0
0
0
Michael Stefaniuc : wcmd: Remove an unused variable (PVS-Studio).
by Alexandre Julliard
23 Feb '15
23 Feb '15
Module: wine Branch: master Commit: b7c8b62bbf632fe26db0a19bfe40cb51ac69d0f2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b7c8b62bbf632fe26db0a19bf…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:23:01 2015 +0100 wcmd: Remove an unused variable (PVS-Studio). --- programs/cmd/wcmdmain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e5865e6..bc9b216 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1046,7 +1046,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; - BOOL launched = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1098,8 +1097,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) pathposn = pathtosearch; WINE_TRACE("Searching in '%s' for '%s'\n", wine_dbgstr_w(pathtosearch), wine_dbgstr_w(stemofsearch)); - while (!launched && pathposn) { - + while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; WCHAR *pos = NULL; BOOL found = FALSE;
1
0
0
0
← Newer
1
...
11
12
13
14
15
16
17
...
42
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Results per page:
10
25
50
100
200