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

Chris Robinson : quartz: Partially implement the MPEG 1 Stream Splitter filter.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: b3fab140f3de793d8781201ff0ba0d5b38a4cbff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fab140f3de793d8781201ff… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Apr 24 05:28:14 2007 -0700 quartz: Partially implement the MPEG 1 Stream Splitter filter. --- dlls/quartz/Makefile.in | 1 + dlls/quartz/main.c | 1 + dlls/quartz/mpegsplit.c | 543 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/quartz_private.h | 1 + dlls/quartz/regsvr.c | 33 +++ 5 files changed, 579 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3fab140f3de793d87812…

1 0

Kevin Koltzau : user32: Draw menu item bitmaps in the correct location when the scroll arrows are active .
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 069f5b90ae79593d5a9acfba292d9a26da6b2506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069f5b90ae79593d5a9acfba2… Author: Kevin Koltzau <kevin(a)plop.org> Date: Thu Apr 26 22:03:06 2007 -0400 user32: Draw menu item bitmaps in the correct location when the scroll arrows are active. --- dlls/user32/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 63cb444..4aca343 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1515,7 +1515,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, if( menuBar && !(lpitem->hbmpItem == HBMMENU_CALLBACK)) bmprc.top = 0; else - bmprc.top = (lpitem->rect.bottom - lpitem->rect.top - + bmprc.top = (rect.bottom - rect.top - lpitem->bmpsize.cy) / 2; bmprc.bottom = bmprc.top + lpitem->bmpsize.cy; } @@ -1570,7 +1570,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, !( checked && (menu->dwStyle & MNS_CHECKORBMP))) { POINT origorg; /* some applications make this assumption on the DC's origin */ - SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg); + SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); MENU_DrawBitmapItem(hdc, lpitem, &bmprc, hmenu, hwndOwner, odaction, FALSE); SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); @@ -1588,7 +1588,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, { /* Draw the bitmap */ POINT origorg; - SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg); + SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); MENU_DrawBitmapItem( hdc, lpitem, &bmprc, hmenu, hwndOwner, odaction, menuBar); SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL);

1 0

Alexandre Julliard : winecoreaudio: Avoid sizeof in trace.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: b43167a4cfe2321320536e4e3da65d10a4afd32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43167a4cfe2321320536e4e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 11:55:07 2007 +0200 winecoreaudio: Avoid sizeof in trace. --- dlls/winecoreaudio.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 98d7d8f..27c87cb 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -711,8 +711,8 @@ static DWORD MIDIIn_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("Invalid parameter %p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData, - lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); + WARN("Invalid parameter %p %p %08x %d\n", lpMidiHdr, lpMidiHdr->lpData, + lpMidiHdr->dwFlags, dwSize); return MMSYSERR_INVALPARAM; }

1 0

Alexey Markachev : ntdll: Fix mistake in Novosibirsk time zone.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 160f1c350e3760bc75e673f7774c29fca42cb4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160f1c350e3760bc75e673f77… Author: Alexey Markachev <alexey(a)etersoft.ru> Date: Thu Apr 26 13:03:55 2007 +0400 ntdll: Fix mistake in Novosibirsk time zone. --- dlls/ntdll/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index ea316d1..30c71db 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -403,7 +403,7 @@ static const struct tagTZ_INFO TZ_INFO[] = {'P','h','i','l','i','p','p','i','n','e',' ','T','i','m','e','\0'}, -480, 0}, {"NOVST", {'N','o','v','o','s','i','b','i','r','s','k',' ','S','u','m','m','e','r', - ' ','T','i','m','e','\0'}, -480, 1}, + ' ','T','i','m','e','\0'}, -420, 1}, {"UZT", {'U','z','b','e','k','i','s','t','h','a','n',' ','T','i','m','e','\0'}, -300, 0} };

1 0

Stefan Dösinger : ddraw: Use EnumAttachedSurfaces for SetColorKey.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 88af9702f161849702d8f138f9e14e63f951bf64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88af9702f161849702d8f138f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 21:15:30 2007 +0200 ddraw: Use EnumAttachedSurfaces for SetColorKey. --- dlls/ddraw/surface.c | 66 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e374f98..4d62362 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2073,6 +2073,45 @@ IDirectDrawSurfaceImpl_GetPalette(IDirectDrawSurface7 *iface, } /***************************************************************************** + * SetColorKeyEnum + * + * EnumAttachedSurface callback for SetColorKey. Used to set color keys + * recursively in the surface tree + * + *****************************************************************************/ +struct SCKContext +{ + HRESULT ret; + WINEDDCOLORKEY *CKey; + DWORD Flags; +}; + +static HRESULT WINAPI +SetColorKeyEnum(IDirectDrawSurface7 *surface, + DDSURFACEDESC2 *desc, + void *context) +{ + ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, surface); + struct SCKContext *ctx = context; + HRESULT hr; + + hr = IWineD3DSurface_SetColorKey(This->WineD3DSurface, + ctx->Flags, + ctx->CKey); + if(hr != DD_OK) + { + WARN("IWineD3DSurface_SetColorKey failed, hr = %08x\n", hr); + ctx->ret = hr; + } + + IDirectDrawSurface7_EnumAttachedSurfaces(surface, + context, + SetColorKeyEnum); + IDirectDrawSurface7_Release(surface); + return DDENUMRET_OK; +} + +/***************************************************************************** * IDirectDrawSurface7::SetColorKey * * Sets the color keying options for the surface. Observations showed that @@ -2094,8 +2133,7 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, DDCOLORKEY *CKey) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); - IDirectDrawSurfaceImpl *surf; - HRESULT hr; + struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) CKey, Flags }; TRACE("(%p)->(%x,%p)\n", This, Flags, CKey); if (CKey) @@ -2150,23 +2188,17 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } } - for(surf = This->first_complex; surf; surf = surf->next_complex) + ctx.ret = IWineD3DSurface_SetColorKey(This->WineD3DSurface, + Flags, + ctx.CKey); + IDirectDrawSurface7_EnumAttachedSurfaces(iface, + (void *) &ctx, + SetColorKeyEnum); + switch(ctx.ret) { - hr = IWineD3DSurface_SetColorKey(surf->WineD3DSurface, - Flags, - (WINEDDCOLORKEY *) CKey); - if(FAILED(hr)) - { - WARN("IWineD3DSurface::SetColorKey for surface %p failed with hr=%08x\n", - surf->WineD3DSurface, hr); - switch(hr) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; - } - } + case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; + default: return ctx.ret; } - return DD_OK; } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: Search for texture sublevels with GetAttachedSurface.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: a46012eff218b7aac6359a304f1a3ed2b9c2bc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46012eff218b7aac6359a304… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 20:30:45 2007 +0200 ddraw: Search for texture sublevels with GetAttachedSurface. --- dlls/ddraw/ddraw.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df107ce..8b8308a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1598,12 +1598,20 @@ D3D7CB_CreateSurface(IUnknown *device, { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); IDirectDrawSurfaceImpl *surf = This->tex_root; - int i; + int i = 0; TRACE("(%p) call back. surf=%p\n", device, surf); /* Find the wanted mipmap. There are enough mipmaps in the chain */ - for(i = 0; i < level; i++) - surf = surf->next_complex; + while(i < level) + { + IDirectDrawSurface7 *attached; + IDirectDrawSurface7_GetAttachedSurface(ICOM_INTERFACE(surf, IDirectDrawSurface7), + &This->tex_root->surface_desc.ddsCaps, + &attached); + surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, attached); + IDirectDrawSurface7_Release(attached); + i++; + } /* Return the surface */ *Surface = surf->WineD3DSurface;

1 0

Stefan Dösinger : ddraw: Use EnumAttachedSurfaces to search for a render target.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: c2ffffe1ffe163e57100b9c9df766a114ad46da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ffffe1ffe163e57100b9c9d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 20:26:16 2007 +0200 ddraw: Use EnumAttachedSurfaces to search for a render target. --- dlls/ddraw/ddraw.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3f8cea8..df107ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2574,6 +2574,28 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw7 *iface, return DD_OK; } +static HRESULT WINAPI +findRenderTarget(IDirectDrawSurface7 *surface, + DDSURFACEDESC2 *desc, + void *ctx) +{ + IDirectDrawSurfaceImpl *surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, surface); + IDirectDrawSurfaceImpl **target = (IDirectDrawSurfaceImpl **) ctx; + + if(!surf->isRenderTarget) { + *target = surf; + IDirectDrawSurface7_Release(surface); + return DDENUMRET_CANCEL; + } + + /* Recurse into the surface tree */ + IDirectDrawSurface7_EnumAttachedSurfaces(surface, ctx, findRenderTarget); + + IDirectDrawSurface7_Release(surface); + if(*target) return DDENUMRET_CANCEL; + else return DDENUMRET_OK; /* Continue with the next neighbor surface */ +} + /***************************************************************************** * D3D7CB_CreateRenderTarget * @@ -2606,25 +2628,29 @@ D3D7CB_CreateRenderTarget(IUnknown *device, IUnknown *pSuperior, HANDLE* pSharedHandle) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); - IDirectDrawSurfaceImpl *d3dSurface = (IDirectDrawSurfaceImpl *) This->d3d_target->first_complex; + IDirectDrawSurfaceImpl *d3dSurface = This->d3d_target->first_complex, *target = NULL; TRACE("(%p) call back\n", device); - /* Loop through the complex chain and try to find unused primary surfaces */ - while(d3dSurface->isRenderTarget) + if(d3dSurface->isRenderTarget) + { + IDirectDrawSurface7_EnumAttachedSurfaces(ICOM_INTERFACE(d3dSurface, IDirectDrawSurface7), + &target, findRenderTarget); + } + else { - d3dSurface = d3dSurface->next_complex; - if(!d3dSurface) break; + target = d3dSurface; } - if(!d3dSurface) + + if(!target) { - d3dSurface = This->d3d_target; + target = This->d3d_target; ERR(" (%p) : No DirectDrawSurface found to create the back buffer. Using the front buffer as back buffer. Uncertain consequences\n", This); } /* TODO: Return failure if the dimensions do not match, but this shouldn't happen */ - *ppSurface = d3dSurface->WineD3DSurface; - d3dSurface->isRenderTarget = TRUE; + *ppSurface = target->WineD3DSurface; + target->isRenderTarget = TRUE; TRACE("Returning wineD3DSurface %p, it belongs to surface %p\n", *ppSurface, d3dSurface); return D3D_OK; }

1 0

Stefan Dösinger : ddraw: Add a test for EnumSurfaces.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 86eb79b0c9d642f07b4c2f0e07f9f90b22a36650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86eb79b0c9d642f07b4c2f0e0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 19:43:56 2007 +0200 ddraw: Add a test for EnumSurfaces. --- dlls/ddraw/tests/dsurface.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 2d5a625..e269983 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -885,6 +885,64 @@ static void GetDDInterface_7(void) IDirectDrawSurface7_Release(dsurface7); } +#define MAXEXPECTED 8 /* Can match up to 8 expected surfaces */ +struct enumstruct +{ + IDirectDrawSurface *expected[MAXEXPECTED]; + UINT count; +}; + +static HRESULT WINAPI enumCB(IDirectDrawSurface *surf, DDSURFACEDESC *desc, void *ctx) +{ + int i; + BOOL found = FALSE; + + for(i = 0; i < MAXEXPECTED; i++) + { + if(((struct enumstruct *)ctx)->expected[i] == surf) found = TRUE; + } + + ok(found, "Unexpected surface %p enumerated\n", surf); + ((struct enumstruct *)ctx)->count++; + IDirectDrawSurface_Release(surf); + return DDENUMRET_OK; +} + +static void EnumTest(void) +{ + HRESULT rc; + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + struct enumstruct ctx; + + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(ddsd).dwMipMapCount = 3; + ddsd.dwWidth = 32; + ddsd.dwHeight = 32; + rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(rc==DD_OK,"CreateSurface returned: %x\n",rc); + + memset(&ctx, 0, sizeof(ctx)); + ctx.expected[0] = surface; + rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[0], &ddsd.ddsCaps, &ctx.expected[1]); + ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); + rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[1], &ddsd.ddsCaps, &ctx.expected[2]); + ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); + rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); + ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); + ctx.count = 0; + + rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, (void *) &ctx, enumCB); + ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); + ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); + + IDirectDrawSurface_Release(ctx.expected[2]); + IDirectDrawSurface_Release(ctx.expected[1]); + IDirectDrawSurface_Release(surface); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -896,5 +954,6 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); + EnumTest(); ReleaseDirectDraw(); }

1 0

Andrew Riedi : winex11.drv: Add legacy 32-bit cursor support.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 2c709c59b81732ee481f3a3d81214ed485187583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c709c59b81732ee481f3a3d8… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Apr 25 16:49:22 2007 -0700 winex11.drv: Add legacy 32-bit cursor support. --- dlls/winex11.drv/mouse.c | 154 +++++++++++++++++++++++++++------------------ 1 files changed, 92 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c709c59b81732ee481f3…

1 0

Yuval Fledel : schannel: Tests for SpLsaModeInitialize, SpUserModeInitialize and GetInfo.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 735df24617154f689cbedf1510afea35a47a40e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735df24617154f689cbedf151… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Wed Apr 25 22:49:08 2007 +0300 schannel: Tests for SpLsaModeInitialize, SpUserModeInitialize and GetInfo. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/schannel/tests/Makefile.in | 13 +++ dlls/schannel/tests/main.c | 180 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 208 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=735df24617154f689cbed…

1 0