January 2008 - Wine-Commits

Lei Zhang : mapi32: Fix UrlEscapeA usage in MAPISendMail.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 992c891c8fc9b8dbb2abe706204e2d6e058def44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992c891c8fc9b8dbb2abe7062… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 14:05:29 2008 -0800 mapi32: Fix UrlEscapeA usage in MAPISendMail. --- dlls/mapi32/sendmail.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 6968f7d..4103117 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -67,6 +67,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; char *mailto = NULL, *escape = NULL; + char empty_string[] = ""; HRESULT res; DWORD size; @@ -178,8 +179,8 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); - size = 0; - res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY ); + size = 1; + res = UrlEscapeA( mailto, empty_string, &size, URL_ESCAPE_SPACES_ONLY ); if (res != E_POINTER) goto exit; escape = HeapAlloc( GetProcessHeap(), 0, size );

1 0

Lei Zhang : shlwapi: Check more arguments to UrlEscapeA.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 43bff70a22e90a9b210d048e087f9435b243f7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bff70a22e90a9b210d048e0… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 13:50:34 2008 -0800 shlwapi: Check more arguments to UrlEscapeA. --- dlls/shlwapi/tests/url.c | 12 +++--------- dlls/shlwapi/url.c | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3506075..b7549bd 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -461,23 +461,17 @@ static void test_UrlEscape(void) ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); - todo_wine { - ok(size == 0, "got %d, expected %d\n", size, 0); - } + ok(size == 0, "got %d, expected %d\n", size, 0); size = 0; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); - todo_wine { - ok(size == 0, "got %d, expected %d\n", size, 0); - } + ok(size == 0, "got %d, expected %d\n", size, 0); size = 1; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); - todo_wine { - ok(size == 1, "got %d, expected %d\n", size, 1); - } + ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 5480357..ac150e6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -843,7 +843,7 @@ HRESULT WINAPI UrlEscapeA( HRESULT ret; DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; - if (!pcchEscaped) + if (!pszEscaped || !pcchEscaped || !*pcchEscaped) return E_INVALIDARG; if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) @@ -854,7 +854,7 @@ HRESULT WINAPI UrlEscapeA( } if(ret == S_OK) { RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR)); - if(pszEscaped && *pcchEscaped > lenA) { + if(*pcchEscaped > lenA) { RtlUnicodeToMultiByteN(pszEscaped, *pcchEscaped - 1, &lenA, escapedW, lenW * sizeof(WCHAR)); pszEscaped[lenA] = 0; *pcchEscaped = lenA;

1 0

Lei Zhang : shlwapi: Additional UrlEscapeA tests.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 0da7c8f4441a19e9bcc6df8ff20425e3886bdf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da7c8f4441a19e9bcc6df8ff… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 13:41:55 2008 -0800 shlwapi: Additional UrlEscapeA tests. --- dlls/shlwapi/tests/url.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 6d219c9..adb6208 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -454,12 +454,37 @@ static void test_url_canonicalize(const char *szUrl, DWORD dwFlags, HRESULT dwEx static void test_UrlEscape(void) { - DWORD size; + DWORD size = 0; HRESULT ret; unsigned int i; + char empty_string[] = ""; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + todo_wine { + ok(size == 0, "got %d, expected %d\n", size, 0); + } + + size = 0; + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + todo_wine { + ok(size == 0, "got %d, expected %d\n", size, 0); + } + + size = 1; + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + todo_wine { + ok(size == 1, "got %d, expected %d\n", size, 1); + } + + size = 1; + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + todo_wine { + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + } + ok(size == 34, "got %d, expected %d\n", size, 34); for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags,

1 0

Lei Zhang : mapi32: Initialize several string buffers.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: c565a8382a659bcd0c29243e1de7d2d02f97b4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c565a8382a659bcd0c29243e1… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 11:53:20 2008 -0800 mapi32: Initialize several string buffers. --- dlls/mapi32/sendmail.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index eb954a5..6968f7d 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -127,16 +127,19 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, { to = HeapAlloc( GetProcessHeap(), 0, to_size ); if (!to) goto exit; + to[0] = 0; } if (cc_size) { cc = HeapAlloc( GetProcessHeap(), 0, cc_size ); if (!cc) goto exit; + cc[0] = 0; } if (bcc_size) { bcc = HeapAlloc( GetProcessHeap(), 0, bcc_size ); if (!bcc) goto exit; + bcc[0] = 0; } if (message->lpOriginator)

1 0

Lei Zhang : shlwapi: Check an argument to UrlEscapeA.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 32fda2113dc9598b187b81b90b366e72f4beb7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fda2113dc9598b187b81b90… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jan 9 13:50:14 2008 -0800 shlwapi: Check an argument to UrlEscapeA. --- dlls/shlwapi/tests/url.c | 5 +++++ dlls/shlwapi/url.c | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index adb6208..3506075 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -480,6 +480,11 @@ static void test_UrlEscape(void) } size = 1; + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 1, "got %d, expected %d\n", size, 1); + + size = 1; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); todo_wine { ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d1f64fe..5480357 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -843,6 +843,9 @@ HRESULT WINAPI UrlEscapeA( HRESULT ret; DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + if (!pcchEscaped) + return E_INVALIDARG; + if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) {

1 0

Dmitry Timoshkov : gdi32: Fix the regression caused by the scaling font metrics patch.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 92a74a82711ad15372f951addb3f525b593a26de URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a74a82711ad15372f951add… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 9 21:58:00 2008 +0800 gdi32: Fix the regression caused by the scaling font metrics patch. --- dlls/gdi32/freetype.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 480b8e5..2de49d4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3125,13 +3125,15 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->ppem = height; - ret->aveWidth = abs(lf.lfWidth); - ret->scale_x = 0.0; ret->scale_y = 0.0; + ret->aveWidth = abs(lf.lfWidth); + if(!face->scalable) { + ret->ppem = face->size.height; + if (height != 0) ret->ppem += diff; + width = face->size.x_ppem >> 6; height = face->size.y_ppem >> 6; }

1 0

Jeremy Newman : fix broken link to bugzilla docs
by Jeremy Newman Jan. 9, 2008

Jan. 9, 2008

Module: bugzilla Branch: master Commit: fbed87e9453b20585487e79eee5685db8c5342b6 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=fbed87e9453b20585487e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jan 9 16:07:03 2008 -0600 fix broken link to bugzilla docs --- template/en/default/index.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 1e435fb..bfff44e 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -186,7 +186,7 @@ function addSidebar() { </li> </ol> - <a href="docs/html/">More Help</a> on using Bugzilla. + <a href="http://www.bugzilla.org/docs/3.0/html/">More Help</a> on using Bugzilla. <a href="mailto:bugs-admin(a)winehq.org">Email</a> WineHQ Bugzilla Administrator

1 0

Gerald Pfeifer : gdi32: Tighten range checking in PlayEnhMetaFileRecord() and remove four useless checks.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 43837ed227b076edcf1e29cb55528a4faa1aa3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43837ed227b076edcf1e29cb5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 6 18:42:57 2008 +0100 gdi32: Tighten range checking in PlayEnhMetaFileRecord() and remove four useless checks. --- dlls/gdi32/enhmetafile.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 081f7c1..150b82a 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1669,11 +1669,13 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMRCREATEDIBPATTERNBRUSHPT *lpCreate = (const EMRCREATEDIBPATTERNBRUSHPT *)mr; LPVOID lpPackedStruct; - /* check that offsets and data are contained within the record */ - if ( !( (lpCreate->cbBmi>=0) && (lpCreate->cbBits>=0) && - (lpCreate->offBmi>=0) && (lpCreate->offBits>=0) && - ((lpCreate->offBmi +lpCreate->cbBmi ) <= mr->nSize) && - ((lpCreate->offBits+lpCreate->cbBits) <= mr->nSize) ) ) + /* Check that offsets and data are contained within the record + * (including checking for wrap arounds). + */ + if ( lpCreate->offBmi + lpCreate->cbBmi > mr->nSize + || lpCreate->offBits + lpCreate->cbBits > mr->nSize + || lpCreate->offBmi + lpCreate->cbBmi < lpCreate->offBmi + || lpCreate->offBits + lpCreate->cbBits < lpCreate->offBits ) { ERR("Invalid EMR_CREATEDIBPATTERNBRUSHPT record\n"); break;

1 0

Divan Burger : comdlg32: Modernize the look of the selected colour box in the colour dialog.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 3a508e605b6f6d4cda750fcd6c2ffbe203474237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a508e605b6f6d4cda750fcd6… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 19:16:42 2008 +0200 comdlg32: Modernize the look of the selected colour box in the colour dialog. --- dlls/comdlg32/colordlg.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index b4f3951..74d3357 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -441,16 +441,8 @@ void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) hBrush = CreateSolidBrush(cr); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, rect.right/2, rect.bottom); - DeleteObject ( SelectObject(hdc, hBrush) ) ; - hBrush = CreateSolidBrush( GetNearestColor(hdc, cr) ); - if (hBrush) - { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.right/2-1, rect.top, rect.right, rect.bottom); - DeleteObject(SelectObject(hdc, hBrush)) ; - } + FillRect(hdc, &rect, hBrush); + DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT); } ReleaseDC(hwnd, hdc); }

1 0

Divan Burger : comdlg32: Modernize the look of the colour graph' s cross in the colour dialog.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 285c9fc6406762bd2f83fbaa893b2479f7b017ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=285c9fc6406762bd2f83fbaa8… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 19:10:44 2008 +0200 comdlg32: Modernize the look of the colour graph's cross in the colour dialog. --- dlls/comdlg32/colordlg.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 4abcd75..b4f3951 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -513,7 +513,8 @@ void CC_PaintTriangle( HWND hDlg, int y) void CC_PaintCross( HWND hDlg, int x, int y) { HDC hDC; - int w = GetDialogBaseUnits(); + int w = GetDialogBaseUnits() - 1; + int wc = GetDialogBaseUnits() * 3 / 4; HWND hwnd = GetDlgItem(hDlg, 0x2c6); LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); RECT rect; @@ -525,8 +526,7 @@ void CC_PaintCross( HWND hDlg, int x, int y) GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); - hPen = CreatePen(PS_SOLID, 2, 0xffffff); /* -white- color */ - hPen = SelectObject(hDC, hPen); + point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; if ( lpp->oldcross.left != lpp->oldcross.right ) @@ -539,11 +539,18 @@ void CC_PaintCross( HWND hDlg, int x, int y) lpp->oldcross.top = point.y - w - 1; lpp->oldcross.bottom = point.y + w + 1; + hPen = CreatePen(PS_SOLID, 3, 0x000000); /* -black- color */ + hPen = SelectObject(hDC, hPen); MoveToEx(hDC, point.x - w, point.y, &p); + LineTo(hDC, point.x - wc, point.y); + MoveToEx(hDC, point.x + wc, point.y, &p); LineTo(hDC, point.x + w, point.y); MoveToEx(hDC, point.x, point.y - w, &p); + LineTo(hDC, point.x, point.y - wc); + MoveToEx(hDC, point.x, point.y + wc, &p); LineTo(hDC, point.x, point.y + w); - DeleteObject( SelectObject(hDC, hPen)) ; + DeleteObject( SelectObject(hDC, hPen)); + ReleaseDC(hwnd, hDC); } }

1 0