wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Jon Griffiths : oleaut32: Don' t read past the digits array in VARIANT_FormatNumber.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 6158db605567dbc351a1349ca41abdf2e6db4032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6158db605567dbc351a1349ca… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 10:17:16 2008 -0700 oleaut32: Don't read past the digits array in VARIANT_FormatNumber. --- dlls/oleaut32/varformat.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index b2175d3..83f075f 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1463,7 +1463,8 @@ VARIANT_FormatNumber_Bool: while (count-- > 0) *pBuff++ = '0'; } - if (*pToken == FMT_NUM_COPY_ZERO || have_int > 1 || *prgbDig > 0) + if (*pToken == FMT_NUM_COPY_ZERO || have_int > 1 || + (have_int > 0 && *prgbDig > 0)) { dwState |= NUM_WRITE_ON; count = min(count_max, have_int);

1 0

Jon Griffiths : Fix minor comment typos.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 938ab8a633e7395cd0347f5be3aef1c97f5b55b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938ab8a633e7395cd0347f5be… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 11:04:34 2008 -0700 Fix minor comment typos. --- dlls/oleaut32/varformat.c | 2 +- dlls/shlwapi/assoc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 3b35d38..b2175d3 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -284,7 +284,7 @@ typedef struct tagFMT_DATE_HEADER #define FMT_STR_COPY_SPACE 0x40 /* Copy len chars with space if no char */ #define FMT_STR_COPY_SKIP 0x41 /* Copy len chars or skip if no char */ /* Wine additions */ -#define FMT_WINE_HOURS_12 0x81 /* Hours using 12 hour clockhourCopy len chars or skip if no char */ +#define FMT_WINE_HOURS_12 0x81 /* Hours using 12 hour clock */ /* Named Formats and their tokenised values */ static const WCHAR szGeneralDate[] = { 'G','e','n','e','r','a','l',' ','D','a','t','e','\0' }; diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index caac827..e3c3830 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -503,7 +503,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) * PARAMS * iface [I] IQueryAssociations interface to initialise * cfFlags [I] ASSOCF_ flags from "shlwapi.h" - * pszAssoc [I] String for the root key name, or NULL if hkProgid is given + * pszAssoc [I] String for the root key name, or NULL if hkeyProgid is given * hkeyProgid [I] Handle for the root key, or NULL if pszAssoc is given * hWnd [I] Reserved, must be NULL. *

1 0

Jon Griffiths : msvcr71: Forward __pctype_func.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 6b9705600fc9ef4bc329ac78e31ac05a7010c822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9705600fc9ef4bc329ac78e… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 10:55:04 2008 -0700 msvcr71: Forward __pctype_func. --- dlls/msvcr71/msvcr71.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 65e1dff..38c314a 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -150,7 +150,7 @@ @ cdecl __p__winminor() msvcrt.__p__winminor @ cdecl __p__winver() msvcrt.__p__winver @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr -@ stub __pctype_func +@ cdecl __pctype_func() msvcrt.__p__pctype @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs

1 0

Jon Griffiths : wsock32: Forward TransmitFile to the implementation in mswsock.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 9da5157c364c95bf46b18da3fab133237f917953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da5157c364c95bf46b18da3f… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 08:18:52 2008 -0700 wsock32: Forward TransmitFile to the implementation in mswsock. --- dlls/wsock32/wsock32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index 3a4b32a..9297984 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec @@ -73,6 +73,6 @@ 1119 stdcall GetServiceA(long ptr ptr long ptr ptr ptr) 1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) #1130 stub NPLoadNameSpaces -1140 stub TransmitFile +1140 stdcall TransmitFile(long ptr long long ptr long) mswsock.TransmitFile 1141 stdcall AcceptEx(long long ptr long long long ptr ptr) mswsock.AcceptEx 1142 stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) mswsock.GetAcceptExSockaddrs

1 0

Jon Griffiths : oleaut32: Fix memcpy overlapping ranges in SysReAllocStringLen.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 8c16ae7a7f89fbf4f07211122b89ebe5fab9942c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c16ae7a7f89fbf4f07211122… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 08:42:27 2008 -0700 oleaut32: Fix memcpy overlapping ranges in SysReAllocStringLen. --- dlls/oleaut32/oleaut.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 9fdac76..9884416 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -287,7 +287,7 @@ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) * * NOTES * See BSTR(), SysAllocStringByteLen(). - * *pbstr may be changed by this function. + * *old may be changed by this function. */ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) { @@ -301,7 +301,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) *old = (BSTR)(ptr+1); *ptr = newbytelen; if (str) { - memcpy(*old, str, newbytelen); + memmove(*old, str, newbytelen); (*old)[len] = 0; } else { /* Subtle hidden feature: The old string data is still there

1 0

Jon Griffiths : oleaut32/test: Fix valgrind leaks.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 0cf087820e1a2b058f3b772422465ca5ff87e21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf087820e1a2b058f3b77242… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 09:21:08 2008 -0700 oleaut32/test: Fix valgrind leaks. --- dlls/oleaut32/tests/varformat.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 2b60c96..228ad1c 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -64,9 +64,11 @@ static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ - if (hres == S_OK) \ + if (hres == S_OK) { \ ok(str && strcmpW(str,szResult1) == 0, \ - "VarFormatNumber (vt %d): string different\n", vt) + "VarFormatNumber (vt %d): string different\n", vt); \ + if (str) SysFreeString(str); \ + } static void test_VarFormatNumber(void) { @@ -126,7 +128,7 @@ static void test_VarFormatNumber(void) static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s', got 0x%08x, '%s'\n"; #define VARFMT(vt,v,val,fmt,ret,str) do { \ - if (out) SysFreeString(out); out = NULL; \ + out = NULL; \ V_VT(&in) = (vt); v(&in) = val; \ if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); \ hres = pVarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ @@ -135,6 +137,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s' ok(hres == ret && (FAILED(ret) || !strcmp(buff, str)), \ szVarFmtFail, \ (vt)&VT_TYPEMASK,(vt)&~VT_TYPEMASK,fmt?fmt:"<null>",ret,str,hres,buff); \ + if (out) SysFreeString(out); \ } while(0) typedef struct tagFMTRES

1 0

Alexander Morozov : wininet: Add port number to Host HTTP header.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 4f51b6c1d8582e57ddc97c23f8ec8bfe91842fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f51b6c1d8582e57ddc97c23f… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jul 3 16:34:40 2008 +0400 wininet: Add port number to Host HTTP header. --- dlls/wininet/http.c | 33 ++++++++++++++++++++++++++++++--- dlls/wininet/tests/http.c | 4 ---- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8171838..7607721 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1453,14 +1453,20 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b WCHAR url[INTERNET_MAX_URL_LENGTH]; HTTPHEADERW *host; DWORD len; + WCHAR *pch; - static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; static const WCHAR hostW[] = {'H','o','s','t',0}; TRACE("INTERNET_OPTION_URL\n"); host = HTTP_GetHeader(req, hostW); - sprintfW(url, formatW, host->lpszValue, req->lpszPath); + strcpyW(url, httpW); + strcatW(url, host->lpszValue); + if (NULL != (pch = strchrW(url + strlenW(httpW), ':'))) + *pch = 0; + strcatW(url, req->lpszPath); + TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); if(unicode) { @@ -1885,9 +1891,11 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, LPWININETHTTPREQW lpwhr; LPWSTR lpszCookies; LPWSTR lpszUrl = NULL; + LPWSTR lpszHostName = NULL; DWORD nCookieSize; HINTERNET handle = NULL; static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; + static const WCHAR szHostForm[] = {'%','s',':','%','u',0}; DWORD len; LPHTTPHEADERW Host; @@ -1914,6 +1922,14 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, lpwhr->lpHttpSession = lpwhs; list_add_head( &lpwhs->hdr.children, &lpwhr->hdr.entry ); + lpszHostName = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * + (strlenW(lpwhs->lpszHostName) + 7 /* length of ":65535" + 1 */)); + if (NULL == lpszHostName) + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + goto lend; + } + handle = WININET_AllocHandle( &lpwhr->hdr ); if (NULL == handle) { @@ -1968,7 +1984,17 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, else lpwhr->lpszVersion = WININET_strdupW(g_szHttp1_1); - HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + if (lpwhs->nHostPort != INTERNET_INVALID_PORT_NUMBER && + lpwhs->nHostPort != INTERNET_DEFAULT_HTTP_PORT && + lpwhs->nHostPort != INTERNET_DEFAULT_HTTPS_PORT) + { + sprintfW(lpszHostName, szHostForm, lpwhs->lpszHostName, lpwhs->nHostPort); + HTTP_ProcessHeader(lpwhr, szHost, lpszHostName, + HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + } + else + HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, + HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (lpwhs->nServerPort == INTERNET_INVALID_PORT_NUMBER) lpwhs->nServerPort = (dwFlags & INTERNET_FLAG_SECURE ? @@ -2014,6 +2040,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, sizeof(handle)); lend: + HeapFree(GetProcessHeap(), 0, lpszHostName); if( lpwhr ) WININET_Release( &lpwhr->hdr ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d6da2ca..272e3e7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1734,7 +1734,6 @@ static void test_connection_header(int port) size = sizeof(status); ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); ok(ret, "HttpQueryInfo failed\n"); - todo_wine ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(req); @@ -1749,7 +1748,6 @@ static void test_connection_header(int port) size = sizeof(status); ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); ok(ret, "HttpQueryInfo failed\n"); - todo_wine ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(req); @@ -1764,7 +1762,6 @@ static void test_connection_header(int port) size = sizeof(status); ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); ok(ret, "HttpQueryInfo failed\n"); - todo_wine ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(req); @@ -1779,7 +1776,6 @@ static void test_connection_header(int port) size = sizeof(status); ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); ok(ret, "HttpQueryInfo failed\n"); - todo_wine ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(req);

1 0

Alexander Morozov : wininet: Add support of INTERNET_FLAG_NO_CACHE_WRITE.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: ad2f53db8f51c088d4a556aae4704a0a82aedb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2f53db8f51c088d4a556aae… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jul 4 14:00:29 2008 +0400 wininet: Add support of INTERNET_FLAG_NO_CACHE_WRITE. --- dlls/wininet/http.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 970e502..8171838 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3181,6 +3181,12 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, static const WCHAR pragma_nocache[] = {'P','r','a','g','m','a',':',' ','n','o','-','c','a','c','h','e','\r','\n',0}; HTTP_HttpAddRequestHeadersW(lpwhr, pragma_nocache, strlenW(pragma_nocache), HTTP_ADDREQ_FLAG_ADD_IF_NEW); } + if ((lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) && !strcmpW(lpwhr->lpszVerb, szPost)) + { + static const WCHAR cache_control[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l',':', + ' ','n','o','-','c','a','c','h','e','\r','\n',0}; + HTTP_HttpAddRequestHeadersW(lpwhr, cache_control, strlenW(cache_control), HTTP_ADDREQ_FLAG_ADD_IF_NEW); + } do {

1 0

Nikolay Sivov : gdiplus: Check arguments in GdipPathIterNextSubpath.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 142907c0d28e95ccd7d428d4246567e701017dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=142907c0d28e95ccd7d428d42… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 5 13:02:58 2008 +0400 gdiplus: Check arguments in GdipPathIterNextSubpath. --- dlls/gdiplus/pathiterator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index bca9df0..026665a 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -151,7 +151,7 @@ GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, { INT i, count; - if(!iterator) + if(!iterator || !startIndex || !endIndex || !isClosed || !resultCount) return InvalidParameter; count = iterator->pathdata.Count;

1 0

Nikolay Sivov : gdiplus: Implementation of GdipPathIterGetSubpathCount with tests.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 20501e4ca8225208dacb4d7415b7cc9a5845c0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20501e4ca8225208dacb4d741… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 5 13:02:51 2008 +0400 gdiplus: Implementation of GdipPathIterGetSubpathCount with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 16 +++++++++++++ dlls/gdiplus/tests/pathiterator.c | 44 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index df28863..04e0eb5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -453,7 +453,7 @@ @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) @ stdcall GdipPathIterEnumerate(ptr ptr ptr ptr long) @ stdcall GdipPathIterGetCount(ptr ptr) -@ stub GdipPathIterGetSubpathCount +@ stdcall GdipPathIterGetSubpathCount(ptr ptr) @ stdcall GdipPathIterHasCurve(ptr ptr) @ stub GdipPathIterIsValid @ stdcall GdipPathIterNextMarker(ptr ptr ptr ptr) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index e9ba03e..bca9df0 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -105,6 +105,22 @@ GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator* iterator, BOOL* hasCurv return Ok; } +GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator* iterator, INT* count) +{ + INT i; + + if(!iterator || !count) + return InvalidParameter; + + *count = 0; + for(i = 0; i < iterator->pathdata.Count; i++){ + if(iterator->pathdata.Types[i] == PathPointTypeStart) + (*count)++; + } + + return Ok; +} + GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *resultCount, INT* startIndex, INT* endIndex) { diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 3406ce6..385be88 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -146,6 +146,49 @@ static void test_nextmarker(void) GdipDeletePath(path); } +static void test_getsubpathcount(void) +{ + GpPath *path; + GpPathIterator *iter; + GpStatus stat; + INT count; + + /* NULL args */ + stat = GdipPathIterGetSubpathCount(NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterGetSubpathCount(NULL, &count); + expect(InvalidParameter, stat); + + GdipCreatePath(FillModeAlternate, &path); + + /* empty path */ + GdipCreatePathIter(&iter, path); + stat = GdipPathIterGetSubpathCount(iter, &count); + expect(Ok, stat); + expect(0, count); + GdipDeletePathIter(iter); + + GdipAddPathLine(path, 5.0, 5.0, 100.0, 50.0); + + /* open figure */ + GdipCreatePathIter(&iter, path); + stat = GdipPathIterGetSubpathCount(iter, &count); + expect(Ok, stat); + expect(1, count); + GdipDeletePathIter(iter); + + /* manually start new figure */ + GdipStartPathFigure(path); + GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); + GdipCreatePathIter(&iter, path); + stat = GdipPathIterGetSubpathCount(iter, &count); + expect(Ok, stat); + expect(2, count); + GdipDeletePathIter(iter); + + GdipDeletePath(path); +} + START_TEST(pathiterator) { struct GdiplusStartupInput gdiplusStartupInput; @@ -161,6 +204,7 @@ START_TEST(pathiterator) test_constructor_destructor(); test_hascurve(); test_nextmarker(); + test_getsubpathcount(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c33645a..0859ad7 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -285,6 +285,7 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*); GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*); GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*); +GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator*,INT*); GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator*,INT*,GpPointF*,BYTE*,INT); GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator*,BOOL*);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2008