February 2015 - Wine-commits

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

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

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

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

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

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

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

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

Austin English : x3daudio1_6: Add stub dll.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 06ebbe77a069820d92a57623a8c4d66622cd3bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ebbe77a069820d92a57623a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 20 13:10:39 2015 -0600 x3daudio1_6: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_6/Makefile.in | 4 ++++ dlls/x3daudio1_6/main.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_6/x3daudio1_6.spec | 2 ++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index d59987b..3c2a1bc 100755 --- a/configure +++ b/configure @@ -1324,6 +1324,7 @@ enable_wtsapi32 enable_wuapi enable_wuaueng enable_x3daudio1_1 +enable_x3daudio1_6 enable_x3daudio1_7 enable_xapofx1_1 enable_xapofx1_3 @@ -17678,6 +17679,7 @@ wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 +wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index f611fa5..03f629a 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_1) +WINE_CONFIG_DLL(x3daudio1_6) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in new file mode 100644 index 0000000..ad59b8f --- /dev/null +++ b/dlls/x3daudio1_6/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_6.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_6/main.c b/dlls/x3daudio1_6/main.c new file mode 100644 index 0000000..ea6732f --- /dev/null +++ b/dlls/x3daudio1_6/main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_6/x3daudio1_6.spec b/dlls/x3daudio1_6/x3daudio1_6.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_6/x3daudio1_6.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 49815a60f9c3b6abaa8fae1411113584e248e647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49815a60f9c3b6abaa8fae141… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 12 09:37:20 2015 +0200 po: Update Lithuanian translation. --- po/lt.po | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6835c77..6049b4e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-03 19:00+0300\n" +"PO-Revision-Date: 2015-02-20 19:22+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2732,11 +2732,6 @@ msgstr "" "Ar tikrai norite pašalinti šį liudijimą?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -13220,15 +13215,15 @@ msgstr "(Sistemos numatytasis)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "Erdvinis 5.1" +msgstr "Erdviniai 5.1" #: winecfg.rc:90 msgid "Quadraphonic" -msgstr "Kvadrofoninis" +msgstr "Kvadrofoniniai" #: winecfg.rc:91 msgid "Stereo" -msgstr "Stereofoninis" +msgstr "Stereofoniniai" #: winecfg.rc:92 msgid "Mono"

1 0