April 2007 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Use GL_APPLE_client_storage if available.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 4f5d33311b6d0a672b2c4f216ca00aee815a344b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5d33311b6d0a672b2c4f216… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 31 23:02:37 2007 +0200 wined3d: Use GL_APPLE_client_storage if available. --- dlls/wined3d/context.c | 8 ++++ dlls/wined3d/device.c | 1 + dlls/wined3d/surface.c | 71 +++++++++++++++++++++++++++++++++++++-- dlls/wined3d/volume.c | 6 +++- dlls/wined3d/wined3d_private.h | 5 ++- 5 files changed, 85 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5d33311b6d0a672b2c4…

1 0

Stefan Dösinger : wined3d: Add GL_APPLE_client_storage to our extension list.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: f9ee2355d02566cfb544f5cb53941d0826d8fa74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ee2355d02566cfb544f5cb5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 31 15:52:28 2007 +0200 wined3d: Add GL_APPLE_client_storage to our extension list. --- dlls/wined3d/directx.c | 2 ++ include/wine/wined3d_gl.h | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0dbe57..dea1d43 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -812,6 +812,8 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { */ gl_info->supported[NV_FENCE] = FALSE; gl_info->supported[APPLE_FENCE] = TRUE; + } else if (strstr(ThisExtn, "GL_APPLE_client_storage")) { + gl_info->supported[APPLE_CLIENT_STORAGE] = TRUE; } if (*GL_Extensions == ' ') GL_Extensions++; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index dbb76a1..1b4744f 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1147,7 +1147,7 @@ typedef void (APIENTRY * PGLFNFINISHFENCENVPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNISFENCENVPROC) (GLuint); typedef void (APIENTRY * PGLFNGETFENCEIVNVPROC) (GLuint, GLenum, GLint *); /* GL_APPLE_fence */ -#ifndef GL_NV_fence +#ifndef GL_APPLE_fence #define GL_DRAW_PIXELS_APPLE 0x8A0A #define GL_FENCE_APPLE 0x84F3 #endif @@ -1159,6 +1159,10 @@ typedef void (APIENTRY * PGLFNFINISHFENCEAPPLEPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNISFENCEAPPLEPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNTESTOBJECTAPPLEPROC) (GLenum, GLuint); typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint); +/* GL_APPLE_client_storage */ +#ifndef GL_APPLE_client_storage +#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 +#endif /* GL_ATI_envmap_bumpmap */ #ifndef GL_ATI_envmap_bumpmap #define GL_BUMP_ROT_MATRIX_ATI 0x8775 @@ -1540,6 +1544,7 @@ typedef enum _GL_SupportedExt { ATI_ENVMAP_BUMPMAP, /* APPLE */ APPLE_FENCE, + APPLE_CLIENT_STORAGE, OPENGL_SUPPORTED_EXT_END } GL_SupportedExt;

1 0

Dan Kegel : imagehlp: BindImageEx stub should report success.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 71971409c8489b1c52dda8ac3a2d46788a18d9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71971409c8489b1c52dda8ac3… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Mar 31 06:20:15 2007 -0700 imagehlp: BindImageEx stub should report success. --- dlls/imagehlp/modify.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index a858ad9..47aa44c 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -53,8 +53,7 @@ BOOL WINAPI BindImageEx( Flags, debugstr_a(ImageName), debugstr_a(DllPath), debugstr_a(SymbolPath), StatusRoutine ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; }

1 0

Laurent Vromman : gdi32: Add two basic tests to check what WidenPath does.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: a11c7514630bfb1f8d1bf6403f7744cc14e7d775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11c7514630bfb1f8d1bf6403… Author: Laurent Vromman <laurent(a)vromman.org> Date: Sat Mar 31 13:01:20 2007 +0200 gdi32: Add two basic tests to check what WidenPath does. --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/path.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 96e2ce0..31cc771 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -16,6 +16,7 @@ CTESTS = \ mapping.c \ metafile.c \ palette.c \ + path.c \ pen.c @MAKE_TEST_RULES@ diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c new file mode 100644 index 0000000..0346b28 --- /dev/null +++ b/dlls/gdi32/tests/path.c @@ -0,0 +1,84 @@ +/* + * Unit test suite for paths + * + * Copyright 2007 Laurent Vromman + * + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#include "wine/test.h" + +#include "winuser.h" +#include "winerror.h" + +static void test_widenpath(void) +{ + HDC hdc = GetDC(0); + HPEN greenPen; + HPEN oldPen; + POINT pnt[6]; + INT nSize; + + /* Create a pen to be used in WidenPath */ + greenPen = CreatePen(PS_SOLID, 10, RGB(0,0,0)); + oldPen = SelectObject(hdc, greenPen); + + /* Prepare a path */ + pnt[0].x = 100; + pnt[0].y = 0; + pnt[1].x = 200; + pnt[1].y = 0; + pnt[2].x = 300; + pnt[2].y = 100; + pnt[3].x = 300; + pnt[3].y = 200; + pnt[4].x = 200; + pnt[4].y = 300; + pnt[5].x = 100; + pnt[5].y = 300; + + /* Set a polyline path */ + BeginPath(hdc); + Polyline(hdc, pnt, 6); + EndPath(hdc); + + /* Widen the polyline path */ + ok(WidenPath(hdc), "WidenPath fails while widening a poyline path.\n"); + + /* Test if WidenPath seems to have done his job */ + nSize = GetPath(hdc, NULL, NULL, 0); + ok(nSize != -1, "GetPath fails after calling WidenPath.\n"); + ok(nSize > 6, "Path number of points is to low. Should be more than 6 but is %d\n", nSize); + + todo_wine { + /* Test WidenPath with an empty path */ + SetLastError(0xdeadbeef); + BeginPath(hdc); + ok(WidenPath(hdc) == FALSE, "WidenPath fails while widening an empty path. Error : %d\n", GetLastError()); + } + + ReleaseDC(0, hdc); + return; +} + +START_TEST(path) +{ + test_widenpath(); +}

1 0

Paul Vriens : advapi32/tests: Some cleanup.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: ddaacfbe2cbb26500234ec4fc44e0845a91455c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaacfbe2cbb26500234ec4fc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Mar 31 13:01:24 2007 +0200 advapi32/tests: Some cleanup. --- dlls/advapi32/tests/registry.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4296fd5..a3491c3 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -281,10 +281,13 @@ static void test_enum_value(void) /* Unicode tests */ - SetLastError(0); + SetLastError(0xdeadbeef); res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)foobarW, 7*sizeof(WCHAR) ); if (res==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) - return; + { + skip("RegSetValueExW is not implemented\n"); + goto cleanup; + } ok( res == 0, "RegSetValueExW failed error %d\n", res ); /* overflow both name and data */ @@ -342,6 +345,10 @@ static void test_enum_value(void) ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + +cleanup: + RegDeleteKeyA(test_key, ""); + RegCloseKey(test_key); } static void test_query_value_ex(void) @@ -783,14 +790,16 @@ static void test_reg_query_value(void) SetLastError(0xdeadbeef); size = MAX_PATH; ret = RegQueryValueA((HKEY)0xcafebabe, "subkey", val, &size); - ok(ret == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", ret); + ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_BADKEY, /* Windows 98 returns BADKEY */ + "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a NULL hkey */ SetLastError(0xdeadbeef); size = MAX_PATH; ret = RegQueryValueA(NULL, "subkey", val, &size); - ok(ret == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", ret); + ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_BADKEY, /* Windows 98 returns BADKEY */ + "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a NULL value */ @@ -880,6 +889,7 @@ static void test_reg_query_value(void) cleanup: RegDeleteKeyA(subkey, ""); + RegCloseKey(subkey); } START_TEST(registry)

1 0

Paul Vriens : advapi32/tests: Reopen the main handle if needed.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 11f6e89f873e615650fc260ae80796d299cb3ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f6e89f873e615650fc260ae… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Mar 31 12:14:10 2007 +0200 advapi32/tests: Reopen the main handle if needed. --- dlls/advapi32/tests/registry.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index f67364a..4296fd5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -631,6 +631,16 @@ static void test_reg_close_key(void) ret = RegCloseKey(NULL); ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_BADKEY, /* Windows 95 returns BADKEY */ "expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", ret); + + /* Check to see if we didn't potentially close our main handle, which could happen on win98 as + * win98 doesn't give a new handle when the same key is opened. + * Not re-opening will make some next tests fail. + */ + if (hkey_main == hkHandle) + { + trace("The main handle is most likely closed, so re-opening\n"); + RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main ); + } } static void test_reg_delete_key(void)

1 0

Felix Nawothnig : wined3d: Make CreateCubeTexture fail when not supported.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: c343fb1cdfb9c96e86af97951d4549ab5d5384ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c343fb1cdfb9c96e86af97951… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Fri Mar 30 21:29:38 2007 +0200 wined3d: Make CreateCubeTexture fail when not supported. --- dlls/d3d8/tests/texture.c | 27 +++++++++++++++++++++++++++ dlls/d3d9/tests/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 5 +++++ 3 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c index 3e0b805..df7da8b 100644 --- a/dlls/d3d8/tests/texture.c +++ b/dlls/d3d8/tests/texture.c @@ -101,6 +101,32 @@ static void test_texture_stage_states(IDirect3DDevice8 *device_ptr, int num_stag } } +static void test_cube_texture_from_pool(IDirect3DDevice8 *device_ptr, DWORD caps, D3DPOOL pool, BOOL need_cap) +{ + IDirect3DCubeTexture8 *texture_ptr = NULL; + HRESULT hr; + + hr = IDirect3DDevice8_CreateCubeTexture(device_ptr, 512, 1, 0, D3DFMT_X8R8G8B8, pool, &texture_ptr); + trace("pool=%d hr=0x%.8x\n", pool, hr); + + if((caps & D3DPTEXTURECAPS_CUBEMAP) || !need_cap) + ok(SUCCEEDED(hr), "hr=0x%.8x\n", hr); + else + ok(hr == D3DERR_INVALIDCALL, "hr=0x%.8x\n", hr); + + if(texture_ptr) IDirect3DCubeTexture8_Release(texture_ptr); +} + +static void test_cube_textures(IDirect3DDevice8 *device_ptr, DWORD caps) +{ + trace("texture caps: 0x%.8x\n", caps); + + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_DEFAULT, TRUE); + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_MANAGED, TRUE); + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SYSTEMMEM, TRUE); + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SCRATCH, FALSE); +} + START_TEST(texture) { D3DCAPS8 caps; @@ -120,4 +146,5 @@ START_TEST(texture) IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); test_texture_stage_states(device_ptr, caps.MaxTextureBlendStages); + test_cube_textures(device_ptr, caps.TextureCaps); } diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index d34ac4b..79d855d 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -100,6 +100,32 @@ static void test_texture_stage_states(IDirect3DDevice9 *device_ptr, int num_stag } } +static void test_cube_texture_from_pool(IDirect3DDevice9 *device_ptr, DWORD caps, D3DPOOL pool, BOOL need_cap) +{ + IDirect3DCubeTexture9 *texture_ptr = NULL; + HRESULT hr; + + hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 512, 1, 0, D3DFMT_X8R8G8B8, pool, &texture_ptr, NULL); + trace("pool=%d hr=0x%.8x\n", pool, hr); + + if((caps & D3DPTEXTURECAPS_CUBEMAP) || !need_cap) + ok(SUCCEEDED(hr), "hr=0x%.8x\n", hr); + else + ok(hr == D3DERR_INVALIDCALL, "hr=0x%.8x\n", hr); + + if(texture_ptr) IDirect3DCubeTexture9_Release(texture_ptr); +} + +static void test_cube_textures(IDirect3DDevice9 *device_ptr, DWORD caps) +{ + trace("texture caps: 0x%.8x\n", caps); + + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_DEFAULT, TRUE); + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_MANAGED, TRUE); + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SYSTEMMEM, TRUE); + test_cube_texture_from_pool(device_ptr, caps, D3DPOOL_SCRATCH, FALSE); +} + START_TEST(texture) { D3DCAPS9 caps; @@ -119,4 +145,5 @@ START_TEST(texture) IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); test_texture_stage_states(device_ptr, caps.MaxTextureBlendStages); + test_cube_textures(device_ptr, caps.TextureCaps); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7863714..ea09780 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -999,6 +999,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface return WINED3DERR_INVALIDCALL; } + if (!GL_SUPPORT(ARB_TEXTURE_CUBE_MAP) && Pool != WINED3DPOOL_SCRATCH) { + WARN("(%p) : Tried to create not supported cube texture\n", This); + return WINED3DERR_INVALIDCALL; + } + D3DCREATERESOURCEOBJECTINSTANCE(object, CubeTexture, WINED3DRTYPE_CUBETEXTURE, 0); D3DINITIALIZEBASETEXTURE(object->baseTexture);

1 0

Felix Nawothnig : gdi32: Properly handle negative font widths.
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: f73d7d07c8a4b7653848f66910e05dc8a9687511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73d7d07c8a4b7653848f6691… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Fri Mar 30 14:58:32 2007 +0200 gdi32: Properly handle negative font widths. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f7b1220..c372477 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2953,7 +2953,7 @@ found: TRACE("caching: gdiFont=%p hfont=%p\n", ret, hfont); - ret->aveWidth = FT_IS_SCALABLE(ret->ft_face) ? lf.lfWidth : 0; + ret->aveWidth = FT_IS_SCALABLE(ret->ft_face) ? abs(lf.lfWidth) : 0; list_add_head(&gdi_font_list, &ret->entry); return ret; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2f7a6a9..532037c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -30,6 +30,8 @@ #include "wine/test.h" +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); @@ -1481,6 +1483,46 @@ static void test_text_metrics(const LOGFONTA *lf) hfont_old = SelectObject(hdc, hfont); + if(lf->lfWidth > 0) { + HFONT hfont2; + GLYPHMETRICS gm1, gm2; + LOGFONTA lf2 = *lf; + MAT2 mat2 = { {0,1}, {0,0}, {0,0}, {0,1} }; + + /* negative widths are handled just as positive ones */ + lf2.lfWidth *= -1; + + SetLastError(0xdeadbeef); + hfont2 = CreateFontIndirectA(&lf2); + ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError()); + SelectObject(hdc, hfont2); + + memset(&gm1, 0xaa, sizeof(gm1)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat2); + ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); + + SelectObject(hdc, hfont); + DeleteObject(hfont2); + + memset(&gm2, 0xbb, sizeof(gm2)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm2, 0, NULL, &mat2); + ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); + + ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX && + gm1.gmBlackBoxY == gm2.gmBlackBoxY && + gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x && + gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y && + gm1.gmCellIncX == gm2.gmCellIncX && + gm1.gmCellIncY == gm2.gmCellIncY, + "gm1=%d,%d,%d,%d,%d,%d gm2=%d,%d,%d,%d,%d,%d\n", + gm1.gmBlackBoxX, gm1.gmBlackBoxY, gm1.gmptGlyphOrigin.x, + gm1.gmptGlyphOrigin.y, gm1.gmCellIncX, gm1.gmCellIncY, + gm2.gmBlackBoxX, gm2.gmBlackBoxY, gm2.gmptGlyphOrigin.x, + gm2.gmptGlyphOrigin.y, gm2.gmCellIncX, gm2.gmCellIncY); + } + size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); if (size == GDI_ERROR) {

1 0

Chris Robinson : quartz: Set the sample time based on the number of bytes read before sending it downstream .
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: 9d1f49cd9f9f0bdf49fb886eb614847e31ffac09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1f49cd9f9f0bdf49fb886eb… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 31 19:31:27 2007 -0700 quartz: Set the sample time based on the number of bytes read before sending it downstream. --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/pin.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6e5db5e..726776b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1045,6 +1045,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dwTimeout, IMediaSample ** ppSample, DWORD_PTR * pdwUser) { HRESULT hr = S_OK; + DWORD dwBytes = 0; DATAREQUEST * pDataRq = NULL; FileAsyncReader *This = impl_from_IAsyncReader(iface); @@ -1083,7 +1084,6 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (SUCCEEDED(hr)) { - DWORD dwBytes; /* get any errors */ if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1091,6 +1091,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (SUCCEEDED(hr)) { + IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); *ppSample = pDataRq->pSample; *pdwUser = pDataRq->dwUserData; } diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 58e5bee..84a2c30 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1198,6 +1198,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) * so that one sample is processed while one sample is fetched. However, * it is harder to debug so for the moment it will stay as it is */ IMediaSample * pSample = NULL; + REFERENCE_TIME rtSampleStart; REFERENCE_TIME rtSampleStop; DWORD_PTR dwUser; @@ -1209,10 +1210,11 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) if (SUCCEEDED(hr)) { - rtSampleStop = This->rtCurrent + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(pSample)); + rtSampleStart = This->rtCurrent; + rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(pSample)); if (rtSampleStop > This->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(This->rtStop), allocProps.cbAlign)); - hr = IMediaSample_SetTime(pSample, &This->rtCurrent, &rtSampleStop); + hr = IMediaSample_SetTime(pSample, &rtSampleStart, &rtSampleStop); This->rtCurrent = rtSampleStop; } @@ -1226,6 +1228,14 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) hr = IPin_QueryPinInfo((IPin*)&This->pin, &pinInfo); if (SUCCEEDED(hr)) + { + rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(IMediaSample_GetActualDataLength(pSample)); + if (rtSampleStop > This->rtStop) + rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(This->rtStop), allocProps.cbAlign)); + hr = IMediaSample_SetTime(pSample, &rtSampleStart, &rtSampleStop); + } + + if (SUCCEEDED(hr)) hr = This->fnSampleProc(This->pin.pUserData, pSample); else ERR("Processing error: %x\n", hr);

1 0

Chris Robinson : quartz: Use a safe APC to kill the PullPin thread when the PullPin is being released .
by Alexandre Julliard April 2, 2007

April 2, 2007

Module: wine Branch: master Commit: b1bfae286f24303e0ca254e92c4859d55dce8b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bfae286f24303e0ca254e92… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 31 20:13:08 2007 -0700 quartz: Use a safe APC to kill the PullPin thread when the PullPin is being released. --- dlls/quartz/pin.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 84a2c30..06313e4 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1121,6 +1121,15 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const return hr; } +static void CALLBACK PullPin_SafeThreadStop(ULONG_PTR handle) +{ + HANDLE hThread = (HANDLE)handle; + + if (hThread) + CloseHandle(hThread); + ExitThread(0); +} + HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { PullPin *This = (PullPin *)iface; @@ -1155,7 +1164,14 @@ ULONG WINAPI PullPin_Release(IPin * iface) if (!refCount) { if (This->hThread) - PullPin_StopProcessing(This); + { + HRESULT hr; + + if (!QueueUserAPC(PullPin_SafeThreadStop, This->hThread, (ULONG_PTR)This->hThread)) + ERR("Cannot stop PullPin thread (GetLastError() = %d)!", GetLastError()); + if (This->pAlloc && FAILED(hr = IMemAllocator_Decommit(This->pAlloc))) + ERR("Allocator decommit failed with error %x. Possible memory leak\n", hr); + } if(This->pAlloc) IMemAllocator_Release(This->pAlloc); if(This->pReader)

1 0