May 2010 - Wine-commits - list.winehq.org

Piotr Caban : shlwapi: Make UrlCanonicalizeW working with long urls (> INTERNET_MAX_URL_LENGTH).
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: fc543890d103d87f1a343c924278f89d953071b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc543890d103d87f1a343c924… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 8 18:00:36 2010 +0200 shlwapi: Make UrlCanonicalizeW working with long urls (>INTERNET_MAX_URL_LENGTH). --- dlls/shlwapi/url.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index cd83b45..28ea818 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -287,11 +287,12 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, static const WCHAR wszFile[] = {'f','i','l','e',':'}; static const WCHAR wszRes[] = {'r','e','s',':'}; static const WCHAR wszLocalhost[] = {'l','o','c','a','l','h','o','s','t'}; + static const WCHAR wszFilePrefix[] = {'f','i','l','e',':','/','/','/'}; TRACE("(%s, %p, %p, 0x%08x) *pcchCanonicalized: %d\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags, pcchCanonicalized ? *pcchCanonicalized : -1); - if(!pszUrl || !pszCanonicalized || !pcchCanonicalized) + if(!pszUrl || !pszCanonicalized || !pcchCanonicalized || !*pcchCanonicalized) return E_INVALIDARG; if(!*pszUrl) { @@ -300,8 +301,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, } nByteLen = (strlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ + /* Allocate memory for simplified URL (before escaping) */ lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, - INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); + nByteLen+sizeof(wszFilePrefix)+sizeof(WCHAR)); if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) && !memcmp(wszFile, pszUrl, sizeof(wszFile))) @@ -328,8 +330,6 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, state = 0; if(pszUrl[1] == ':') { /* Assume path */ - static const WCHAR wszFilePrefix[] = {'f','i','l','e',':','/','/','/'}; - memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); if (dwFlags & URL_FILE_USE_PATHURL) @@ -833,6 +833,8 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, if (ret == S_OK) { /* Reuse mrelative as temp storage as its already allocated and not needed anymore */ + if(*pcchCombined == 0) + *pcchCombined = 1; ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, (dwFlags & ~URL_FILE_USE_PATHURL)); if(SUCCEEDED(ret) && pszCombined) { lstrcpyW(pszCombined, mrelative);

1 0

Piotr Caban : shlwapi: Make UrlCanonicalizeA working with long urls (> INTERNET_MAX_URL_LENGTH).
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: 40119690b8c86d227a3b9bffeceb79d328ea4424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40119690b8c86d227a3b9bffe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 8 18:00:49 2010 +0200 shlwapi: Make UrlCanonicalizeA working with long urls (>INTERNET_MAX_URL_LENGTH). --- dlls/shlwapi/url.c | 42 ++++++++++++++++++------------------------ 1 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 28ea818..ad7d989 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -232,40 +232,34 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized, LPDWORD pcchCanonicalized, DWORD dwFlags) { - LPWSTR base, canonical; + LPWSTR url, canonical; HRESULT ret; - DWORD len, len2; + DWORD len; TRACE("(%s, %p, %p, 0x%08x) *pcchCanonicalized: %d\n", debugstr_a(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags, pcchCanonicalized ? *pcchCanonicalized : -1); - if(!pszUrl || !pszCanonicalized || !pcchCanonicalized) + if(!pszUrl || !pszCanonicalized || !pcchCanonicalized || !*pcchCanonicalized) return E_INVALIDARG; - base = HeapAlloc(GetProcessHeap(), 0, - (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); - canonical = base + INTERNET_MAX_URL_LENGTH; + len = strlen(pszUrl)+1; + url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + canonical = HeapAlloc(GetProcessHeap(), 0, *pcchCanonicalized*sizeof(WCHAR)); + if(!url || !canonical) { + HeapFree(GetProcessHeap(), 0, url); + HeapFree(GetProcessHeap(), 0, canonical); + return E_OUTOFMEMORY; + } - MultiByteToWideChar(0, 0, pszUrl, -1, base, INTERNET_MAX_URL_LENGTH); - len = INTERNET_MAX_URL_LENGTH; + MultiByteToWideChar(0, 0, pszUrl, -1, url, len); - ret = UrlCanonicalizeW(base, canonical, &len, dwFlags); - if (ret != S_OK) { - *pcchCanonicalized = len * 2; - HeapFree(GetProcessHeap(), 0, base); - return ret; - } + ret = UrlCanonicalizeW(url, canonical, pcchCanonicalized, dwFlags); + if(ret == S_OK) + WideCharToMultiByte(0, 0, canonical, -1, pszCanonicalized, + *pcchCanonicalized+1, 0, 0); - len2 = WideCharToMultiByte(0, 0, canonical, -1, 0, 0, 0, 0); - if (len2 > *pcchCanonicalized) { - *pcchCanonicalized = len2; - HeapFree(GetProcessHeap(), 0, base); - return E_POINTER; - } - WideCharToMultiByte(0, 0, canonical, -1, pszCanonicalized, *pcchCanonicalized, 0, 0); - *pcchCanonicalized = len; - HeapFree(GetProcessHeap(), 0, base); - return S_OK; + HeapFree(GetProcessHeap(), 0, canonical); + return ret; } /*************************************************************************

1 0

Piotr Caban : shlwapi: Added more UrlCanonicalizeA tests.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: ee2abe7f82ec2c04b7710376b8cf59e7cbf23640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2abe7f82ec2c04b7710376b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 8 18:01:02 2010 +0200 shlwapi: Added more UrlCanonicalizeA tests. --- dlls/shlwapi/tests/url.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0dd9643..c828ea9 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -793,7 +793,8 @@ static void test_UrlEscape(void) static void test_UrlCanonicalizeA(void) { unsigned int i; - CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; + CHAR szReturnUrl[4*INTERNET_MAX_URL_LENGTH]; + CHAR longurl[4*INTERNET_MAX_URL_LENGTH]; DWORD dwSize; DWORD urllen; HRESULT hr; @@ -845,6 +846,24 @@ static void test_UrlCanonicalizeA(void) "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); + /* length is set to 0 */ + dwSize=0; + memset(szReturnUrl, '#', urllen+4); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == E_INVALIDARG) && (dwSize == 0), + "got 0x%x with %u and size %u for '%s' and %u (expected 'E_INVALIDARG' and size %u)\n", + hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), 0); + + /* url length > INTERNET_MAX_URL_SIZE */ + dwSize=sizeof(szReturnUrl); + memset(longurl, 'a', sizeof(longurl)); + memcpy(longurl, winehqA, sizeof(winehqA)-1); + longurl[sizeof(longurl)-1] = '\0'; + hr = pUrlCanonicalizeA(longurl, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok(hr == S_OK, "hr = %x\n", hr); + test_url_canonicalize(-1, "", 0, S_OK, S_FALSE /* Vista/win2k8 */, "", FALSE); /* test url-modification */

1 0

Piotr Caban : wininet: Fix trace messages.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: c0890590ab56f017720b36d569dbc641980f70e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0890590ab56f017720b36d56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 8 18:01:15 2010 +0200 wininet: Fix trace messages. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c82ee29..eb3c8e2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1447,7 +1447,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, lpUrlComponents->nScheme = UCW.nScheme; lpUrlComponents->nPort = UCW.nPort; - TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", lpszUrl, + TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_a(lpszUrl), debugstr_an(lpUrlComponents->lpszScheme, lpUrlComponents->dwSchemeLength), debugstr_an(lpUrlComponents->lpszHostName, lpUrlComponents->dwHostNameLength), debugstr_an(lpUrlComponents->lpszUrlPath, lpUrlComponents->dwUrlPathLength), @@ -1860,7 +1860,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, - lpdwBufferLength, lpdwBufferLength ? *lpdwBufferLength : -1, dwFlags); + lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); if(dwFlags & ICU_DECODE) {

1 0

Jacek Caban : mshtml: Check return value of SetText.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: 11484a0f68a1052decae76630d883265a520f2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11484a0f68a1052decae76630… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 8 18:33:52 2010 +0200 mshtml: Check return value of SetText. Spotted by Gerald Pfeifer. --- dlls/mshtml/htmlbody.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e4bb1d0..18a6041 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -434,6 +434,10 @@ static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT nsres = nsIDOMHTMLBodyElement_SetText(This->nsbody, &text); nsAString_Finish(&text); + if(NS_FAILED(nsres)) { + ERR("SetText failed: %08x\n", nsres); + return E_FAIL; + } return S_OK; }

1 0

Jacek Caban : mshtml: Test return value of OnStateChange.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: f279b0cd4d215d8e5565c20556864500f097f338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f279b0cd4d215d8e5565c2055… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 8 18:34:03 2010 +0200 mshtml: Test return value of OnStateChange. --- dlls/mshtml/tests/script.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index bda1e49..23f1ab8 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2073,7 +2073,9 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST } hres = IActiveScriptSite_OnStateChange(site, (state = ss)); - return hres; + ok(hres == S_OK, "OnStateChange failed: %08x\n", hres); + + return S_OK; } static HRESULT WINAPI ActiveScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState)

1 0

Vincent Povirk : gdiplus: Implement GdipCreateHICONFromBitmap.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: 2dbc3980efc227d9efafa09442b5c2246c114c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbc3980efc227d9efafa0944… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:01:07 2010 -0500 gdiplus: Implement GdipCreateHICONFromBitmap. --- dlls/gdiplus/image.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 56b79e1..bc13ad9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1804,9 +1804,56 @@ GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap *bitmap, GpGraphics *graphic GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap *bitmap, HICON *hicon) { - FIXME("(%p, %p)\n", bitmap, hicon); + GpStatus stat; + BitmapData lockeddata; + ULONG andstride, xorstride, bitssize; + LPBYTE andbits, xorbits, androw, xorrow, srcrow; + UINT x, y; - return NotImplemented; + TRACE("(%p, %p)\n", bitmap, hicon); + + if (!bitmap || !hicon) + return InvalidParameter; + + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, + PixelFormat32bppPARGB, &lockeddata); + if (stat == Ok) + { + andstride = ((lockeddata.Width+31)/32)*4; + xorstride = lockeddata.Width*4; + bitssize = (andstride + xorstride) * lockeddata.Height; + + andbits = GdipAlloc(bitssize); + + if (andbits) + { + xorbits = andbits + andstride * lockeddata.Height; + + for (y=0; y<lockeddata.Height; y++) + { + srcrow = ((LPBYTE)lockeddata.Scan0) + lockeddata.Stride * y; + + androw = andbits + andstride * y; + for (x=0; x<lockeddata.Width; x++) + if (srcrow[3+4*x] >= 128) + androw[x/8] |= 1 << (7-x%8); + + xorrow = xorbits + xorstride * y; + memcpy(xorrow, srcrow, xorstride); + } + + *hicon = CreateIcon(NULL, lockeddata.Width, lockeddata.Height, 1, 32, + andbits, xorbits); + + GdipFree(andbits); + } + else + stat = OutOfMemory; + + GdipBitmapUnlockBits(bitmap, &lockeddata); + } + + return stat; } GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp)

1 0

Vincent Povirk : gdiplus: Quiet the GdipImageForceValidation fixme.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: d2a01883fc3350d69bb059b62fd567c6283ddfca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a01883fc3350d69bb059b62… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:40:45 2010 -0500 gdiplus: Quiet the GdipImageForceValidation fixme. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bc13ad9..0eaaf2e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3503,7 +3503,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC h GpStatus WINGDIPAPI GdipImageForceValidation(GpImage *image) { - FIXME("%p\n", image); + TRACE("%p\n", image); return Ok; }

1 0

Alexandre Julliard : include: Force inlining exported API functions to avoid duplicate definitions.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: f7f4e9e3be9f0bff65857637030dfb0718bfb8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f4e9e3be9f0bff658576370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:38:32 2010 +0200 include: Force inlining exported API functions to avoid duplicate definitions. --- include/winbase.h | 44 ++++++++++++++++++++++---------------------- include/wine/library.h | 13 ++++--------- include/winnt.h | 12 ++++++------ 3 files changed, 32 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7f4e9e3be9f0bff65857…

1 0

Alexandre Julliard : winex11: Fix source/dest width mismatch in SetDIBits.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: 9476937dc385529fadacfb5ddbd9ec7d43cfda01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9476937dc385529fadacfb5dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 8 11:44:40 2010 +0200 winex11: Fix source/dest width mismatch in SetDIBits. --- dlls/winex11.drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index ec97f2d..d72ae00 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4041,8 +4041,8 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.infoBpp == ds.dsBm.bmBitsPixel && physBitmap->base && physBitmap->size < 65536) { - unsigned int srcwidthb = ds.dsBm.bmWidthBytes; - int dstwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); + unsigned int srcwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); + int dstwidthb = ds.dsBm.bmWidthBytes; LPBYTE dbits = physBitmap->base; const BYTE *sbits = (const BYTE*)bits + (startscan * srcwidthb); int widthb;

1 0