July 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: Make the file source rotate around the 'first' sample, to prevent starvation of a single stream.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 2865c727de7e8732fb6646d473b7818271cef0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2865c727de7e8732fb6646d47… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 10 14:33:53 2008 -0700 quartz: Make the file source rotate around the 'first' sample, to prevent starvation of a single stream. This prevents the file source from starving a single thread off. --- dlls/quartz/filesource.c | 62 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 99f8852..2a063e2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -768,6 +768,7 @@ typedef struct FileAsyncReader /* Why would you need more? Every sample has its own handle */ LONG queued_number; LONG samples; + LONG oldest_sample; CRITICAL_SECTION csList; /* critical section to prevent concurrency issues */ DATAREQUEST *sample_list; @@ -1018,9 +1019,10 @@ done: } This->samples = pProps->cBuffers; + This->oldest_sample = 0; TRACE("Samples: %u\n", This->samples); This->sample_list = CoTaskMemAlloc(sizeof(This->sample_list[0]) * pProps->cBuffers); - This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * (pProps->cBuffers + 1)); + This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * pProps->cBuffers * 2); if (This->sample_list && This->handle_list) { @@ -1029,6 +1031,8 @@ done: for (x = 0; x < This->samples; ++x) { This->sample_list[x].ovl.hEvent = This->handle_list[x] = CreateEventW(NULL, 0, 0, NULL); + if (x + 1 < This->samples) + This->handle_list[This->samples + 1 + x] = This->handle_list[x]; } This->handle_list[This->samples] = CreateEventW(NULL, 1, 0, NULL); This->pin.allocProps = *pProps; @@ -1064,7 +1068,6 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample REFERENCE_TIME Stop; FileAsyncReader *This = impl_from_IAsyncReader(iface); LPBYTE pBuffer = NULL; - DWORD wait; TRACE("(%p, %lx)\n", pSample, dwUser); @@ -1085,12 +1088,6 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample return VFW_E_WRONG_STATE; } - wait = WaitForMultipleObjectsEx(This->samples, This->handle_list, FALSE, 0, FALSE); - if (wait < This->samples - 1) - SetEvent(This->handle_list[wait]); - else - wait = This->samples; - if (SUCCEEDED(hr)) { DWORD dwLength = (DWORD) BYTES_FROM_MEDIATIME(Stop - Start); @@ -1098,21 +1095,22 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample int x; /* Try to insert above the waiting sample if possible */ - for (x = wait + 1; x < This->samples; ++x) + for (x = This->oldest_sample; x < This->samples; ++x) { if (!This->sample_list[x].pSample) break; } if (x >= This->samples) - for (x = 0; x < This->samples; ++x) + for (x = 0; x < This->oldest_sample; ++x) { if (!This->sample_list[x].pSample) break; } + /* There must be a sample we have found */ assert(x < This->samples); - InterlockedIncrement(&This->queued_number); + ++This->queued_number; pDataRq = This->sample_list + x; @@ -1154,16 +1152,32 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw *ppSample = NULL; *pdwUser = 0; + EnterCriticalSection(&This->csList); if (!This->bFlushing) { + LONG oldest = This->oldest_sample; + if (!This->queued_number) { /* It could be that nothing is queued right now, but that can be fixed */ WARN("Called without samples in queue and not flushing!!\n"); } + LeaveCriticalSection(&This->csList); /* wait for an object to read, or time out */ - buffer = WaitForMultipleObjectsEx(This->samples+1, This->handle_list, FALSE, dwTimeout, TRUE); + buffer = WaitForMultipleObjectsEx(This->samples+1, This->handle_list + oldest, FALSE, dwTimeout, TRUE); + + EnterCriticalSection(&This->csList); + if (buffer <= This->samples) + { + /* Re-scale the buffer back to normal */ + buffer += oldest; + + /* Uh oh, we overshot the flusher handle, renormalize it back to 0..Samples-1 */ + if (buffer > This->samples) + buffer -= This->samples + 1; + assert(buffer <= This->samples); + } if (buffer >= This->samples) { @@ -1172,11 +1186,10 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw hr = VFW_E_TIMEOUT; buffer = ~0; } - else if (buffer < This->samples) - InterlockedDecrement(&This->queued_number); + else + --This->queued_number; } - EnterCriticalSection(&This->csList); if (This->bFlushing && buffer == ~0) { for (buffer = 0; buffer < This->samples; ++buffer) @@ -1194,7 +1207,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw } else { - InterlockedDecrement(&This->queued_number); + --This->queued_number; hr = S_OK; } } @@ -1239,6 +1252,23 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw assert(rtStop == rtStart); This->sample_list[buffer].pSample = NULL; + assert(This->oldest_sample < This->samples); + + if (buffer == This->oldest_sample) + { + LONG x; + for (x = This->oldest_sample + 1; x < This->samples; ++x) + if (This->sample_list[x].pSample) + break; + if (x >= This->samples) + for (x = 0; x < This->oldest_sample; ++x) + if (This->sample_list[x].pSample) + break; + if (This->oldest_sample == x) + /* No samples found, reset to 0 */ + x = 0; + This->oldest_sample = x; + } } LeaveCriticalSection(&This->csList);

1 0

Andrew Talbot : gdi32: Remove unneeded address-of operator from array name.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 613d17ae92916628fa94444e80a9a307848eaaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=613d17ae92916628fa94444e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 10 23:08:49 2008 +0100 gdi32: Remove unneeded address-of operator from array name. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8cfd7aa..62db9fe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3049,7 +3049,7 @@ static void calc_hash(FONT_DESC *pfd) hash ^= *ptr; for(i = 0, ptr = (DWORD*)&pfd->lf; i < 7; i++, ptr++) hash ^= *ptr; - for(i = 0, ptr = (DWORD*)&pfd->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) { + for(i = 0, ptr = (DWORD*)pfd->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) { two_chars = *ptr; pwc = (WCHAR *)&two_chars; if(!*pwc) break;

1 0

Andrew Talbot : gdiplus: Remove unneeded address-of operator from array name.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: dbc57826d6be8b239a5c6e4e2637aea8b6d0f0ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc57826d6be8b239a5c6e4e2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 10 23:08:52 2008 +0100 gdiplus: Remove unneeded address-of operator from array name. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index e985f29..3526b2e 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -169,7 +169,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, *font = GdipAlloc(sizeof(GpFont)); if(!*font) return OutOfMemory; - memcpy(&(*font)->lfw.lfFaceName, logfont->lfFaceName, LF_FACESIZE * + memcpy((*font)->lfw.lfFaceName, logfont->lfFaceName, LF_FACESIZE * sizeof(WCHAR)); (*font)->lfw.lfHeight = logfont->lfHeight; (*font)->lfw.lfItalic = logfont->lfItalic;

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPenDashCount.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: d12f5c548229c68ad1e1534a0fe48311367a2988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12f5c548229c68ad1e1534a0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 10 23:17:17 2008 +0400 gdiplus: Implemented GdipGetPenDashCount. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8562f98..6b794a1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -356,7 +356,7 @@ @ stub GdipGetPenCustomStartCap @ stdcall GdipGetPenDashArray(ptr ptr long) @ stdcall GdipGetPenDashCap197819(ptr ptr) -@ stub GdipGetPenDashCount +@ stdcall GdipGetPenDashCount(ptr ptr) @ stdcall GdipGetPenDashOffset(ptr ptr) @ stdcall GdipGetPenDashStyle(ptr ptr) @ stdcall GdipGetPenEndCap(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 91d133e..df2d040 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -187,6 +187,16 @@ GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen *pen, GpDashCap *dashCap) return Ok; } +GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen *pen, INT *count) +{ + if(!pen || !count) + return InvalidParameter; + + *count = pen->numdashes; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset) { if(!pen || !offset) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 76c129c..ef65b05 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -34,6 +34,7 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);

1 0

Juan Lang : wintrust: Use path in WIN_TRUST_SUBJECT_FILE structure rather than assuming a path is passed in place of WINTRUST_DATA 's pFile member.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 0c419108ef962f5e8c3e904506b156505802722b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c419108ef962f5e8c3e90450… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 10 12:34:07 2008 -0700 wintrust: Use path in WIN_TRUST_SUBJECT_FILE structure rather than assuming a path is passed in place of WINTRUST_DATA's pFile member. --- dlls/wintrust/wintrust_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index f7fc3ca..28d5a25 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -197,14 +197,13 @@ static LONG WINTRUST_PublishedSoftware(HWND hwnd, GUID *actionID, /* Undocumented: the published software action is passed a path, * and pSIPClientData points to a WIN_TRUST_SUBJECT_FILE. */ - LPCWSTR path = (LPCWSTR)data->u.pFile; LPWIN_TRUST_SUBJECT_FILE subjectFile = (LPWIN_TRUST_SUBJECT_FILE)data->pSIPClientData; WINTRUST_FILE_INFO fileInfo = { sizeof(fileInfo), 0 }; TRACE("subjectFile->hFile: %p\n", subjectFile->hFile); TRACE("subjectFile->lpPath: %s\n", debugstr_w(subjectFile->lpPath)); - fileInfo.pcwszFilePath = path; + fileInfo.pcwszFilePath = subjectFile->lpPath; fileInfo.hFile = subjectFile->hFile; wintrust_data.u.pFile = &fileInfo; wintrust_data.dwUnionChoice = WTD_CHOICE_FILE;

1 0

H. Verbeet : wined3d: Destroy the shader backend after the stateblock.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 6129e92e9903c65d72ec3f34f96d9aa4af779b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6129e92e9903c65d72ec3f34f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 10 23:26:10 2008 +0200 wined3d: Destroy the shader backend after the stateblock. Destroying the stateblock potentially references the shader backend. If the stateblock has active shaders when it is released, the shader's destructor will tell the shader backend to destroy the corresponding resources. This was exposed by my patch that moved the glsl program lookup table into the backend's private data. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d25e1bc..998f950 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2197,7 +2197,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR return WINED3D_OK; err_out: - This->shader_backend->shader_free_private(iface); HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); HeapFree(GetProcessHeap(), 0, This->draw_buffers); @@ -2216,6 +2215,7 @@ err_out: IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->stateBlock); This->stateBlock = NULL; } + This->shader_backend->shader_free_private(iface); return hr; } @@ -2283,7 +2283,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0; } - This->shader_backend->shader_free_private(iface); /* Release the update stateblock */ if(IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock) > 0){ @@ -2304,6 +2303,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D } } + /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ + This->shader_backend->shader_free_private(iface); + /* Release the buffers (with sanity checks)*/ TRACE("Releasing the depth stencil buffer at %p\n", This->stencilBufferTarget); if(This->stencilBufferTarget != NULL && (IWineD3DSurface_Release(This->stencilBufferTarget) >0)){

1 0

Maarten Lankhorst : quartz: End the flush downstream first before restarting playback in pullpin.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 484fdcf7e446aaab859eba1b9ae79d689241592a URL: http://source.winehq.org/git/wine.git/?a=commit;h=484fdcf7e446aaab859eba1b9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 10 14:32:58 2008 -0700 quartz: End the flush downstream first before restarting playback in pullpin. --- dlls/quartz/pin.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index bb562ad..e45db96 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1783,6 +1783,11 @@ HRESULT WINAPI PullPin_EndFlush(IPin * iface) TRACE("(%p)->()\n", iface); + /* Send further first: Else a race condition might terminate processing early */ + EnterCriticalSection(This->pin.pCritSec); + SendFurther( iface, deliver_endflush, NULL, NULL ); + LeaveCriticalSection(This->pin.pCritSec); + EnterCriticalSection(&This->thread_lock); { FILTER_STATE state; @@ -1795,10 +1800,6 @@ HRESULT WINAPI PullPin_EndFlush(IPin * iface) } LeaveCriticalSection(&This->thread_lock); - EnterCriticalSection(This->pin.pCritSec); - SendFurther( iface, deliver_endflush, NULL, NULL ); - LeaveCriticalSection(This->pin.pCritSec); - return S_OK; }

1 0

Zac Brown : include/winhttp.h: Add WinHttp status codes.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: d778f74569ce4cc123b6ec527ef3cdcc71551e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d778f74569ce4cc123b6ec527… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Jul 10 12:01:54 2008 -0700 include/winhttp.h: Add WinHttp status codes. --- include/winhttp.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index 8a6bc17..c87ccd4 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -160,6 +160,50 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) #define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) +/* WinHttp status codes */ +#define HTTP_STATUS_CONTINUE 100 +#define HTTP_STATUS_SWITCH_PROTOCOLS 101 +#define HTTP_STATUS_OK 200 +#define HTTP_STATUS_CREATED 201 +#define HTTP_STATUS_ACCEPTED 202 +#define HTTP_STATUS_PARTIAL 203 +#define HTTP_STATUS_NO_CONTENT 204 +#define HTTP_STATUS_RESET_CONTENT 205 +#define HTTP_STATUS_PARTIAL_CONTENT 206 +#define HTTP_STATUS_WEBDAV_MULTI_STATUS 207 +#define HTTP_STATUS_AMBIGUOUS 300 +#define HTTP_STATUS_MOVED 301 +#define HTTP_STATUS_REDIRECT 302 +#define HTTP_STATUS_REDIRECT_METHOD 303 +#define HTTP_STATUS_NOT_MODIFIED 304 +#define HTTP_STATUS_USE_PROXY 305 +#define HTTP_STATUS_REDIRECT_KEEP_VERB 307 +#define HTTP_STATUS_BAD_REQUEST 400 +#define HTTP_STATUS_DENIED 401 +#define HTTP_STATUS_PAYMENT_REQ 402 +#define HTTP_STATUS_FORBIDDEN 403 +#define HTTP_STATUS_NOT_FOUND 404 +#define HTTP_STATUS_BAD_METHOD 405 +#define HTTP_STATUS_NONE_ACCEPTABLE 406 +#define HTTP_STATUS_PROXY_AUTH_REQ 407 +#define HTTP_STATUS_REQUEST_TIMEOUT 408 +#define HTTP_STATUS_CONFLICT 409 +#define HTTP_STATUS_GONE 410 +#define HTTP_STATUS_LENGTH_REQUIRED 411 +#define HTTP_STATUS_PRECOND_FAILED 412 +#define HTTP_STATUS_REQUEST_TOO_LARGE 413 +#define HTTP_STATUS_URI_TOO_LONG 414 +#define HTTP_STATUS_UNSUPPORTED_MEDIA 415 +#define HTTP_STATUS_RETRY_WITH 449 +#define HTTP_STATUS_SERVER_ERROR 500 +#define HTTP_STATUS_NOT_SUPPORTED 501 +#define HTTP_STATUS_BAD_GATEWAY 502 +#define HTTP_STATUS_SERVICE_UNAVAIL 503 +#define HTTP_STATUS_GATEWAY_TIMEOUT 504 +#define HTTP_STATUS_VERSION_NOT_SUP 505 +#define HTTP_STATUS_FIRST HTTP_STATUS_CONTINUE +#define HTTP_STATUS_LAST HTTP_STATUS_VERSION_NOT_SUP + typedef struct { DWORD dwStructSize;

1 0

Nikolay Sivov : gdiplus: GdipFillRegion actually belongs to Graphics.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 0e840f6186347af699491bb0c40abf944f277ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e840f6186347af699491bb0c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 10 23:15:59 2008 +0400 gdiplus: GdipFillRegion actually belongs to Graphics. --- dlls/gdiplus/graphics.c | 11 +++++++++++ dlls/gdiplus/region.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c127dbb..b6766d8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2114,6 +2114,17 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GD return ret; } +GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, + GpRegion* region) +{ + if (!(graphics && brush && region)) + return InvalidParameter; + + FIXME("(%p, %p, %p): stub\n", graphics, brush, region); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) { static int calls; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 76126ef..fc53c86 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -162,17 +162,6 @@ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) return NotImplemented; } -GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, - GpRegion* region) -{ - if (!(graphics && brush && region)) - return InvalidParameter; - - FIXME("(%p, %p, %p): stub\n", graphics, brush, region); - - return NotImplemented; -} - GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { FIXME("(%p, %p, %p): stub\n", region, graphics, rect);

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetPenDashCap197819.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: fc44cad4a614bc7d56df4feeb366ee84ded76f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc44cad4a614bc7d56df4feeb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 10 23:16:41 2008 +0400 gdiplus: Implemented GdipSetPenDashCap197819. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b1c784d..8562f98 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -568,7 +568,7 @@ @ stdcall GdipSetPenCustomEndCap(ptr ptr) @ stdcall GdipSetPenCustomStartCap(ptr ptr) @ stdcall GdipSetPenDashArray(ptr ptr long) -@ stub GdipSetPenDashCap197819 +@ stdcall GdipSetPenDashCap197819(ptr long) @ stdcall GdipSetPenDashOffset(ptr long) @ stdcall GdipSetPenDashStyle(ptr long) @ stdcall GdipSetPenEndCap(ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 852494f..91d133e 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -357,6 +357,16 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, return Ok; } +GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen *pen, GpDashCap dashCap) +{ + if(!pen) + return InvalidParameter; + + pen->dashcap = dashCap; + + return Ok; +} + /* FIXME: dash offset not used */ GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen *pen, REAL offset) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 25b6f5f..76c129c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -41,6 +41,7 @@ GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT); +GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen*,GpDashCap); GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap);

1 0