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

Tim Schwartz : net.exe: Add missing CloseServiceHandle().
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: a13340d4a0164aa3592b97210e591d89ae088a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13340d4a0164aa3592b97210… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Wed Jun 20 10:57:51 2007 -0500 net.exe: Add missing CloseServiceHandle(). --- programs/net/net.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 4af72ae..0fd85e9 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -44,6 +44,7 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) printf("Stopping dependent service: %s\n", dependencies[counter].lpDisplayName); dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle); + CloseServiceHandle(dependent_serviceHandle); if(!result) printf("Could not stop service %s\n", dependencies[counter].lpDisplayName); } }

1 0

Stefan Dösinger : d3d8: Convert fvfs to vertex declarations.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 527295e57f70358fd9dd6b5004da8bf3cd716ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527295e57f70358fd9dd6b500… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jun 19 22:20:26 2007 +0200 d3d8: Convert fvfs to vertex declarations. --- dlls/d3d8/d3d8_private.h | 10 +++++++ dlls/d3d8/device.c | 64 +++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d8/directx.c | 9 ++++++ 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3182427..229762b 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -167,6 +167,12 @@ extern const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl; typedef void * shader_handle; +struct FvfToDecl +{ + DWORD fvf; + IWineD3DVertexDeclaration *decl; +}; + struct IDirect3DDevice8Impl { /* IUnknown fields */ @@ -179,6 +185,10 @@ struct IDirect3DDevice8Impl shader_handle *shader_handles; shader_handle *free_shader_handles; + /* FVF management */ + struct FvfToDecl *decls; + UINT numConvertedDecls, declArraySize; + /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f7bc68f..0b2436d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -97,9 +97,16 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + int i; + TRACE("Releasing wined3d device %p\n", This->WineD3DDevice); EnterCriticalSection(&d3d8_cs); This->inDestruction = TRUE; + + for(i = 0; i < This->numConvertedDecls; i++) { + IWineD3DVertexDeclaration_Release(This->decls[i].decl); + } + IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D8CB_DestroyDepthStencilSurface, D3D8CB_DestroySwapChain); IWineD3DDevice_Release(This->WineD3DDevice); HeapFree(GetProcessHeap(), 0, This->shader_handles); @@ -1566,6 +1573,59 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 return hrc; } +IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8Impl *This, DWORD fvf) +{ + HRESULT hr; + IWineD3DVertexDeclaration* pDecl = NULL; + int p, low, high; /* deliberately signed */ + struct FvfToDecl *convertedDecls = This->decls; + + TRACE("Searching for declaration for fvf %08x... ", fvf); + + low = 0; + high = This->numConvertedDecls - 1; + while(low <= high) { + p = (low + high) >> 1; + TRACE("%d ", p); + if(convertedDecls[p].fvf == fvf) { + TRACE("found %p\n", convertedDecls[p].decl); + return convertedDecls[p].decl; + } else if(convertedDecls[p].fvf < fvf) { + low = p + 1; + } else { + high = p - 1; + } + } + TRACE("not found. Creating and inserting at position %d.\n", low); + + hr = IWineD3DDevice_CreateVertexDeclarationFromFVF(This->WineD3DDevice, + &pDecl, + (IUnknown *) This, + fvf); + if (FAILED(hr)) return NULL; + + if(This->declArraySize == This->numConvertedDecls) { + int grow = This->declArraySize / 2; + convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, + sizeof(convertedDecls[0]) * (This->numConvertedDecls + grow)); + if(!convertedDecls) { + /* This will destroy it */ + IWineD3DVertexDeclaration_Release(pDecl); + return NULL; + } + This->decls = convertedDecls; + This->declArraySize += grow; + } + + memmove(convertedDecls + low + 1, convertedDecls + low, sizeof(convertedDecls[0]) * (This->numConvertedDecls - low)); + convertedDecls[low].decl = pDecl; + convertedDecls[low].fvf = fvf; + This->numConvertedDecls++; + + TRACE("Returning %p. %d decls in array\n", pDecl, This->numConvertedDecls); + return pDecl; +} + static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; @@ -1575,9 +1635,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 ifa if (VS_HIGHESTFIXEDFXF >= pShader) { TRACE("Setting FVF, %d %d\n", VS_HIGHESTFIXEDFXF, pShader); IWineD3DDevice_SetFVF(This->WineD3DDevice, pShader); - - /* Call SetVertexShader with a NULL shader to set the vertexshader in the stateblock to NULL. */ - IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, NULL); + IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, IDirect3DDevice8Impl_FindDecl(This, pShader)); IWineD3DDevice_SetVertexShader(This->WineD3DDevice, NULL); } else { TRACE("Setting shader\n"); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 62d833a..54c87e6 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -472,6 +472,15 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte *ppReturnedDeviceInterface = NULL; } + object->declArraySize = 16; + object->decls = HeapAlloc(GetProcessHeap(), 0, object->declArraySize * sizeof(*object->decls)); + if(!object->decls) { + ERR("Out of memory\n"); + IWineD3DDevice_Release(object->WineD3DDevice); + HeapFree(GetProcessHeap(), 0, object); + *ppReturnedDeviceInterface = NULL; + hr = E_OUTOFMEMORY; + } return hr; }

1 0

Stefan Dösinger : wined3d: Remove the FVF codepath from drawprim.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 030b92a2f6206fb7586f031c750fe6c263fb7a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030b92a2f6206fb7586f031c7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 4 14:16:32 2007 +0200 wined3d: Remove the FVF codepath from drawprim. --- dlls/wined3d/device.c | 6 +- dlls/wined3d/drawprim.c | 164 ---------------------------------------- dlls/wined3d/state.c | 15 +--- dlls/wined3d/wined3d_private.h | 9 -- 4 files changed, 3 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=030b92a2f6206fb7586f0…

1 0

Stefan Dösinger : wined3d: Unload texture coords for all supported texture stages.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 35ee1e9693f086fa996dec020c74570e3523d942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ee1e9693f086fa996dec020… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jun 20 14:23:04 2007 +0200 wined3d: Unload texture coords for all supported texture stages. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d6522f2..1c72785 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1812,7 +1812,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { int texture_idx; - for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { + for (texture_idx = 0; texture_idx < GL_LIMITS(texture_stages); ++texture_idx) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); }

1 0

Ken Thomases : winecoreaudio: Make wodReset fail if called on a closed device.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 4906ffaa5b93de471411ade2bad856fd7a0e4a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4906ffaa5b93de471411ade2b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:01:11 2007 -0500 winecoreaudio: Make wodReset fail if called on a closed device. --- dlls/winecoreaudio.drv/audio.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 5a3e82b..bc7482c 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1278,7 +1278,14 @@ static DWORD wodReset(WORD wDevID) wwo = &WOutDev[wDevID]; OSSpinLockLock(&wwo->lock); - + + if (wwo->state == WINE_WS_CLOSED) + { + OSSpinLockUnlock(&wwo->lock); + WARN("resetting a closed device\n"); + return MMSYSERR_INVALHANDLE; + } + lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED;

1 0

Dmitry Timoshkov : user32: Make MDI get_client_info checks more strict.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: ea2613fe6195fb4ac50a029204720a9bb1fa57f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2613fe6195fb4ac50a02920… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 20 19:37:05 2007 +0900 user32: Make MDI get_client_info checks more strict. --- dlls/user32/mdi.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 0b488d2..51dd405 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -202,13 +202,15 @@ static MDICLIENTINFO *get_client_info( HWND client ) WND *win = WIN_GetPtr( client ); if (win) { - if (win == WND_OTHER_PROCESS) + if (win == WND_OTHER_PROCESS || win == WND_DESKTOP) { - if (IsWindow(client)) ERR( "client %p belongs to other process\n", client ); + if (IsWindow(client)) WARN( "client %p belongs to other process\n", client ); return NULL; } - if (win->cbWndExtra < sizeof(MDICLIENTINFO)) WARN( "%p is not an MDI client\n", client ); - else ret = (MDICLIENTINFO *)win->wExtra; + if (win->flags & WIN_ISMDICLIENT) + ret = (MDICLIENTINFO *)win->wExtra; + else + WARN( "%p is not an MDI client\n", client ); WIN_ReleasePtr( win ); } return ret; @@ -1040,7 +1042,17 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); - if (!(ci = get_client_info( hwnd ))) return 0; + if (!(ci = get_client_info( hwnd ))) + { + if (message == WM_NCCREATE) + { + WND *wndPtr = WIN_GetPtr( hwnd ); + wndPtr->flags |= WIN_ISMDICLIENT; + WIN_ReleasePtr( wndPtr ); + } + return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : + DefWindowProcA( hwnd, message, wParam, lParam ); + } switch (message) { @@ -1051,8 +1063,6 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; WND *wndPtr = WIN_GetPtr( hwnd ); - wndPtr->flags |= WIN_ISMDICLIENT; - /* Translation layer doesn't know what's in the cs->lpCreateParams * so we have to keep track of what environment we're in. */

1 0

Ken Thomases : winecoreaudio: Extract loop, wodNotifyClient for WAVEHDRs in list, to separate function.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: de480f0b6e24f31132d19ccb83a1e27de7ab2d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de480f0b6e24f31132d19ccb8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:00:55 2007 -0500 winecoreaudio: Extract loop, wodNotifyClient for WAVEHDRs in list, to separate function. --- dlls/winecoreaudio.drv/audio.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index fcd84db..dec3832 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -211,6 +211,7 @@ static HANDLE hThread = NULL; /* Track the thread we create so we can clean it u static CFMessagePortRef Port_SendToMessageThread; static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); +static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr); static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi); @@ -1049,6 +1050,24 @@ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) } } +/* Send the "done" notification for each WAVEHDR in a list. The list must be + * free-standing. It should not be part of a device's queue. + * This function must be called with the WAVEOUT lock *not* held. Furthermore, + * it does not lock it, itself. That's because the callback to the application + * may prompt the application to operate on the device, and we don't want to + * deadlock. + */ +static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) +{ + for ( ; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) + { + lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdr->dwFlags |= WHDR_DONE; + + wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + } +} + /* if force is TRUE then notify the client that all the headers were completed */ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) @@ -1097,13 +1116,7 @@ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) OSSpinLockUnlock(&wwo->lock); /* Now, send the "done" notification for each header in our list. */ - for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) - { - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; - lpWaveHdr->dwFlags |= WHDR_DONE; - - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); - } + wodHelper_NotifyDoneForList(wwo, lpFirstDoneWaveHdr); }

1 0

Ken Thomases : winecoreaudio: Move a variable declaration to narrower scope , reduce whitespace.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 58e37cbebf1957de0ae4481bf0a0f0d1d42950bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e37cbebf1957de0ae4481bf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:01:04 2007 -0500 winecoreaudio: Move a variable declaration to narrower scope, reduce whitespace. --- dlls/winecoreaudio.drv/audio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index dec3832..e5b3e7d 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1072,8 +1072,7 @@ static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) */ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) { - LPWAVEHDR lpWaveHdr; - LPWAVEHDR lpFirstDoneWaveHdr = NULL; + LPWAVEHDR lpFirstDoneWaveHdr = NULL; OSSpinLockLock(&wwo->lock); @@ -1086,6 +1085,7 @@ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) } else { + LPWAVEHDR lpWaveHdr; LPWAVEHDR lpLastDoneWaveHdr = NULL; /* Start from lpQueuePtr and keep notifying until:

1 0

Ken Thomases : winecoreaudio: Move notify of completed WAVEHDRs to end of wodReset.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: ed10114b12b23b809c4e08c77fb2b1386eed391b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed10114b12b23b809c4e08c77… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:01:07 2007 -0500 winecoreaudio: Move notify of completed WAVEHDRs to end of wodReset. --- dlls/winecoreaudio.drv/audio.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index e5b3e7d..5a3e82b 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1265,6 +1265,7 @@ static DWORD wodReset(WORD wDevID) { WINE_WAVEOUT* wwo; OSStatus status; + LPWAVEHDR lpSavedQueuePtr; TRACE("(%u);\n", wDevID); @@ -1276,12 +1277,9 @@ static DWORD wodReset(WORD wDevID) wwo = &WOutDev[wDevID]; - /* updates current notify list */ - /* if resetting, remove all wave headers and notify client that all headers were completed */ - wodHelper_NotifyCompletions(wwo, TRUE); - OSSpinLockLock(&wwo->lock); + lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; @@ -1298,6 +1296,11 @@ static DWORD wodReset(WORD wDevID) return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } + /* Now, send the "done" notification for each header in our list. */ + /* Do this last so the reset operation is effectively complete before the + * app does whatever it's going to do in response to these notifications. */ + wodHelper_NotifyDoneForList(wwo, lpSavedQueuePtr); + return MMSYSERR_NOERROR; }

1 0

Evan Stade : gdiplus: Implemented GdipDrawCurve2.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 5c8b83c524c7059edc4b9ef14f88c08f9760506e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8b83c524c7059edc4b9ef14… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 19 19:31:28 2007 -0700 gdiplus: Implemented GdipDrawCurve2. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 3 ++ include/gdiplusgpstubs.h | 1 + include/gdiplustypes.h | 52 +++++++++++++++++++++++++++- 5 files changed, 139 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3036155..775bde3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -153,7 +153,7 @@ @ stub GdipDrawClosedCurve2I @ stub GdipDrawClosedCurve @ stub GdipDrawClosedCurveI -@ stub GdipDrawCurve2 +@ stdcall GdipDrawCurve2(ptr ptr ptr long long) @ stub GdipDrawCurve2I @ stub GdipDrawCurve3 @ stub GdipDrawCurve3I diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a4ba0ca..f917b65 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -27,6 +27,9 @@ #include "gdiplus_private.h" #include "wine/debug.h" +/* looks-right constant */ +#define TENSION_CONST (0.3) + static inline INT roundr(REAL x) { return (INT) floor(x+0.5); @@ -77,6 +80,34 @@ static GpStatus draw_pie(GpGraphics *graphics, HBRUSH gdibrush, HPEN gdipen, return Ok; } +/* GdipDrawCurve helper function. + * Calculates Bezier points from cardinal spline points. */ +static void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, + REAL *y1, REAL *x2, REAL *y2) +{ + REAL xdiff, ydiff; + + /* calculate tangent */ + xdiff = pts[2].X - pts[0].X; + ydiff = pts[2].Y - pts[0].Y; + + /* apply tangent to get control points */ + *x1 = pts[1].X - tension * xdiff; + *y1 = pts[1].Y - tension * ydiff; + *x2 = pts[1].X + tension * xdiff; + *y2 = pts[1].Y + tension * ydiff; +} + +/* GdipDrawCurve helper function. + * Calculates Bezier points from cardinal spline endpoints. */ +static void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, + REAL tension, REAL *x, REAL *y) +{ + /* tangent at endpoints is the line from the endpoint to the adjacent point */ + *x = roundr(tension * (xadj - xend) + xend); + *y = roundr(tension * (yadj - yend) + yend); +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { if(hdc == NULL) @@ -160,6 +191,58 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, return Ok; } +/* Approximates cardinal spline with Bezier curves. */ +GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPointF *points, INT count, REAL tension) +{ + HGDIOBJ old_pen; + + /* PolyBezier expects count*3-2 points. */ + int i, len_pt = count*3-2; + POINT pt[len_pt]; + REAL x1, x2, y1, y2; + + if(!graphics || !pen) + return InvalidParameter; + + tension = tension * TENSION_CONST; + + calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y, + tension, &x1, &y1); + + pt[0].x = roundr(points[0].X); + pt[0].y = roundr(points[0].Y); + pt[1].x = roundr(x1); + pt[1].y = roundr(y1); + + for(i = 0; i < count-2; i++){ + calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2); + + pt[3*i+2].x = roundr(x1); + pt[3*i+2].y = roundr(y1); + pt[3*i+3].x = roundr(points[i+1].X); + pt[3*i+3].y = roundr(points[i+1].Y); + pt[3*i+4].x = roundr(x2); + pt[3*i+4].y = roundr(y2); + } + + calc_curve_bezier_endp(points[count-1].X, points[count-1].Y, + points[count-2].X, points[count-2].Y, tension, &x1, &y1); + + pt[len_pt-2].x = x1; + pt[len_pt-2].y = y1; + pt[len_pt-1].x = roundr(points[count-1].X); + pt[len_pt-1].y = roundr(points[count-1].Y); + + old_pen = SelectObject(graphics->hdc, pen->gdipen); + + PolyBezier(graphics->hdc, pt, len_pt); + + SelectObject(graphics->hdc, old_pen); + + return Ok; +} + GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 538f1f4..e5c46b3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -21,6 +21,8 @@ #define WINGDIPAPI __stdcall +#define GDIPCONST const + #ifdef __cplusplus extern "C" { #endif @@ -34,6 +36,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index dcafc11..727ca06 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -38,5 +38,6 @@ typedef struct GpSolidFill GpSolidFill; typedef Status GpStatus; typedef Unit GpUnit; typedef BrushType GpBrushType; +typedef PointF GpPointF; #endif diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 006fe09..38fdf58 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -45,7 +45,57 @@ enum Status{ PropertyNotSupported = 20 }; -#ifndef __cplusplus +#ifdef __cplusplus + +class PointF +{ +public: + PointF() + { + X = Y = 0.0f; + } + + PointF(IN const PointF &pt) + { + X = pt.X; + Y = pt.Y; + } + + /* FIXME: missing constructor that takes a SizeF */ + + PointF(IN REAL x, IN REAL y) + { + X = x; + Y = y; + } + + PointF operator+(IN const PointF& pt) const + { + return PointF(X + pt.X, Y + pt.Y); + } + + PointF operator-(IN const PointF& pt) const + { + return PointF(X - pt.X, Y - pt.Y); + } + + BOOL Equals(IN const PointF& pt) + { + return (X == pt.X) && (Y == pt.Y); + } + +public: + REAL X; + REAL Y; +}; + +#else /* end of c++ typedefs */ + +typedef struct PointF +{ + REAL X; + REAL Y; +} PointF; typedef enum Status Status;

1 0