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

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

10 May '10

Module: wine Branch: master Commit: 7dfc674437a113ea2f515dfbc03270c0be42e41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfc674437a113ea2f515dfbc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 13:29:53 2010 -0500 gdiplus: Implement GdipGetImageThumbnail. --- dlls/gdiplus/image.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/image.c | 10 +++++----- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0eaaf2e..8b55115 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3515,9 +3515,46 @@ GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT heigh GpImage **ret_image, GetThumbnailImageAbort cb, VOID * cb_data) { - FIXME("(%p %u %u %p %p %p) stub\n", + GpStatus stat; + GpGraphics *graphics; + UINT srcwidth, srcheight; + + TRACE("(%p %u %u %p %p %p)\n", image, width, height, ret_image, cb, cb_data); - return NotImplemented; + + if (!image || !ret_image) + return InvalidParameter; + + if (!width) width = 120; + if (!height) height = 120; + + GdipGetImageWidth(image, &srcwidth); + GdipGetImageHeight(image, &srcheight); + + stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, + NULL, (GpBitmap**)ret_image); + + if (stat == Ok) + { + stat = GdipGetImageGraphicsContext(*ret_image, &graphics); + + if (stat == Ok) + { + stat = GdipDrawImageRectRectI(graphics, image, + 0, 0, width, height, 0, 0, srcwidth, srcheight, UnitPixel, + NULL, NULL, NULL); + + GdipDeleteGraphics(graphics); + } + + if (stat != Ok) + { + GdipDisposeImage(*ret_image); + *ret_image = NULL; + } + } + + return stat; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8abb40c..0e33049 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1219,16 +1219,16 @@ static void test_getthumbnail(void) UINT width, height; stat = GdipGetImageThumbnail(NULL, 0, 0, &bitmap2, NULL, NULL); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipCreateBitmapFromScan0(128, 128, 0, PixelFormat32bppRGB, NULL, (GpBitmap**)&bitmap1); expect(Ok, stat); stat = GdipGetImageThumbnail(bitmap1, 0, 0, NULL, NULL, NULL); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -1250,7 +1250,7 @@ static void test_getthumbnail(void) expect(Ok, stat); stat = GdipGetImageThumbnail(bitmap1, 32, 32, &bitmap2, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -1266,7 +1266,7 @@ static void test_getthumbnail(void) } stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) {

1 0

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

10 May '10

Module: wine Branch: master Commit: b7c9adcd064606b60e5c14ae3e384ce4a2714801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c9adcd064606b60e5c14ae3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 15:36:02 2010 -0500 gdiplus: Implement GdipIsStyleAvailable. --- dlls/gdiplus/font.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 3a29771..f198863 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -760,15 +760,41 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, return Ok; } +static INT CALLBACK font_has_style_proc(const LOGFONTW *elf, + const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) +{ + INT fontstyle=0; + + if (!ntm) return 1; + + if (ntm->tmWeight >= FW_BOLD) fontstyle |= FontStyleBold; + if (ntm->tmItalic) fontstyle |= FontStyleItalic; + if (ntm->tmUnderlined) fontstyle |= FontStyleUnderline; + if (ntm->tmStruckOut) fontstyle |= FontStyleStrikeout; + + return (INT)lParam != fontstyle; +} + GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, INT style, BOOL* IsStyleAvailable) { - FIXME("%p %d %p stub!\n", family, style, IsStyleAvailable); + HDC hdc; + + TRACE("%p %d %p\n", family, style, IsStyleAvailable); if (!(family && IsStyleAvailable)) return InvalidParameter; - return NotImplemented; + *IsStyleAvailable = FALSE; + + hdc = GetDC(0); + + if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) + *IsStyleAvailable = TRUE; + + ReleaseDC(0, hdc); + + return Ok; } /*****************************************************************************

1 0

Vincent Povirk : gdiplus: Always treat out of range string sizes as INT_MAX .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 435762024f4b6cf4aa348b21bfc9477b16abd216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435762024f4b6cf4aa348b21b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 16:32:18 2010 -0500 gdiplus: Always treat out of range string sizes as INT_MAX. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 879646a..68e422e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3544,8 +3544,8 @@ static GpStatus gdip_format_string(GpGraphics *graphics, nwidth = roundr(rect->Width); nheight = roundr(rect->Height); - if (nwidth == 0 || rect->Width >= INT_MAX) nwidth = INT_MAX; - if (nheight == 0 || rect->Height >= INT_MAX) nheight = INT_MAX; + if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; + if (rect->Height >= INT_MAX || rect->Width < 0.5) nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ /* FIXME: This makes the indexes passed to callback inaccurate. */

1 0

Marcus Meissner : ole32: Fixed 2 uninitialized variable use (Coverity).
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: bf1e9a2e93dc1df2a44bdfe82da3bc3b3470d754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1e9a2e93dc1df2a44bdfe82… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 8 23:50:18 2010 +0200 ole32: Fixed 2 uninitialized variable use (Coverity). --- dlls/ole32/storage32.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bc1fb96..d136837 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4096,9 +4096,11 @@ static HRESULT StorageBaseImpl_CopyStream( if (SUCCEEDED(hr)) hr = StorageBaseImpl_StreamWriteAt(dst, dst_entry, bytes_copied, bytestocopy, data, &byteswritten); - if (SUCCEEDED(hr) && byteswritten != bytestocopy) hr = STG_E_WRITEFAULT; - - bytes_copied.QuadPart += byteswritten; + if (SUCCEEDED(hr)) + { + if (byteswritten != bytestocopy) hr = STG_E_WRITEFAULT; + bytes_copied.QuadPart += byteswritten; + } } } @@ -4370,7 +4372,7 @@ static HRESULT TransactedSnapshotImpl_CopyTree(TransactedSnapshotImpl* This) { DirRef cursor; TransactedDirEntry *entry; - HRESULT hr; + HRESULT hr = S_OK; cursor = This->base.storageDirEntry; entry = &This->entries[cursor];

1 0

Marcus Meissner : wined3d: fixed a NULL deref in create_arb_blt_fragment_program (Coverity).
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 9494cdc56ff8b3a64678ffcf3de643725ce64452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9494cdc56ff8b3a64678ffcf3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 9 00:10:28 2010 +0200 wined3d: fixed a NULL deref in create_arb_blt_fragment_program (Coverity). --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e79538a..f62ff56 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3188,8 +3188,9 @@ static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_i fprogram = masked ? blt_fprograms_masked[tex_type] : blt_fprograms_full[tex_type]; if (!fprogram) { - FIXME("tex_type %#x not supported\n", tex_type); + FIXME("tex_type %#x not supported, falling back to tex_2d\n", tex_type); tex_type = tex_2d; + fprogram = masked ? blt_fprograms_masked[tex_type] : blt_fprograms_full[tex_type]; } GL_EXTCALL(glGenProgramsARB(1, &program_id));

1 0

Nikolay Sivov : kernel32: Fix return code from LocalUnlock for pointer passed to it.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0597e659bd76191ee42dc0691a1d26b050e0c712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0597e659bd76191ee42dc0691… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 9 02:21:50 2010 +0400 kernel32: Fix return code from LocalUnlock for pointer passed to it. --- dlls/kernel32/heap.c | 9 ++++++++- dlls/kernel32/tests/heap.c | 28 ++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4d36a1d..bdfa00b 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1116,7 +1116,14 @@ SIZE_T WINAPI LocalSize( */ BOOL WINAPI LocalUnlock( HLOCAL handle /* [in] Handle of memory object */ -) { +) +{ + if (ISPOINTER( handle )) + { + SetLastError( ERROR_NOT_LOCKED ); + return FALSE; + } + return GlobalUnlock( handle ); } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f7e985d..98c99d7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -249,14 +249,27 @@ static void test_heap(void) res = GlobalUnlock(gbl); ok(res == 1 || - res == 0, /* win9x */ + broken(res == 0), /* win9x */ "Expected 1 or 0, got %d\n", res); res = GlobalUnlock(gbl); ok(res == 1 || - res == 0, /* win9x */ + broken(res == 0), /* win9x */ "Expected 1 or 0, got %d\n", res); + GlobalFree(gbl); + + gbl = GlobalAlloc(GMEM_FIXED, 100); + + SetLastError(0xdeadbeef); + res = GlobalUnlock(gbl); + ok(res == 1 || + broken(res == 0), /* win9x */ + "Expected 1 or 0, got %d\n", res); + ok(GetLastError() == 0xdeadbeef, "got %d\n", GetLastError()); + + GlobalFree(gbl); + /* GlobalSize on an invalid handle */ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ { @@ -268,8 +281,6 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } - GlobalFree(gbl); - /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); @@ -371,6 +382,15 @@ static void test_heap(void) "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n", res, GetLastError()); + /* trying to unlock pointer from LocalAlloc */ + gbl = LocalAlloc(LMEM_FIXED, 100); + SetLastError(0xdeadbeef); + res = LocalUnlock(gbl); + ok(res == 0, "Expected 0, got %d\n", res); + ok(GetLastError() == ERROR_NOT_LOCKED || + broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %d\n", GetLastError()); + LocalFree(gbl); + /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n");

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.44
by Jeremy Newman 10 May '10

10 May '10

Module: website Branch: master Commit: 542aa30cace624123768cf4d3cf8ffb5a8e86cdf URL: http://source.winehq.org/git/website.git/?a=commit;h=542aa30cace624123768cf… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri May 7 20:42:17 2010 +0200 Polish translation for release 1.1.44 --- news/pl/2010050701.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/pl/2010050701.xml b/news/pl/2010050701.xml new file mode 100644 index 0000000..85357b3 --- /dev/null +++ b/news/pl/2010050701.xml @@ -0,0 +1,20 @@ +<news> +<date>Maj 7, 2010</date> +<title>Wydano Wine 1.1.44</title> +<body> + Wydanie rozwojowe Wine 1.1.44 jest już dostępne. + <a href="{$root}/announce/1.1.44">Co nowego</a> w tym wydaniu: +<ul> + <li>Dużo więcej nowych ikonek.</li> + <li>Wsparcie dla 32-bitowych prefiksów w 64-bitowym Wine.</li> + <li>Wiele dodatkowych funkcji msvcr80/90.</li> + <li>Ulepszenia w obsłudze Bidi.</li> + <li>Bardziej kompletne wsparcie dla mmdevapi (odpowiedzialny za dźwięk w Win7).</li> + <li>Ulepszone wsparcie dla łatek MSI.</li> + <li>Kilka poprawek w pulpitowych menu.</li> + <li>Optymalizacje w OLE storage.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.44.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexander Nicolaysen Sørnes : maintainer : Implement checkOutputEditorInput()
by Alexander Nicolaysen Sørnes 09 May '10

09 May '10

Module: appdb Branch: master Commit: 96bf714e10e2ae8adf22a61dfa9d2b0388fdc067 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=96bf714e10e2ae8adf22a61d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat May 8 22:25:26 2010 +0200 maintainer: Implement checkOutputEditorInput() --- include/maintainer.php | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 881b315..34cef97 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -968,6 +968,19 @@ class maintainer return $this->iMaintainerId; } + public function checkOutputEditorInput($aClean) + { + $shErrors = ''; + + if(!getInput('iAppId', $aClean) && !getInput('iVersionId', $aClean)) + $shErrors .= '<li>No application or version has been selected. This should never happen; please contact <a href="mailto:'.APPDB_OWNER_EMAIL.'">'.APPDB_OWNER_EMAIL.'</a></li>'; + + if(!getInput('sMaintainReason', $aClean)) + $shErrors .= '<li>You need to write a short text about why you should be a maintainer</li>'; + + return $shErrors; + } + function getOutputEditorValues($aClean) { $this->iAppId = $aClean['iAppId'];

1 0

Paul Vriens : winhttp/tests: Show the correct error.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: f8470fe408f70bbe3ef67911d6fb0a4adcac23cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8470fe408f70bbe3ef67911d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 8 11:39:51 2010 +0200 winhttp/tests: Show the correct error. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index bf2db07..26477ee 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1654,7 +1654,8 @@ static void test_resolve_timeout(void) SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(!ret, "sent request\n"); - ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", ret); + ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, + "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); WinHttpCloseHandle(req); WinHttpCloseHandle(con);

1 0

Piotr Caban : include: Fix typo in shlwapi.h.
by Alexandre Julliard 08 May '10

08 May '10

Module: wine Branch: master Commit: f4f9b1acdf5019d5fd7e15fae7019784f093472d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f9b1acdf5019d5fd7e15fae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 8 18:00:17 2010 +0200 include: Fix typo in shlwapi.h. --- include/shlwapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index d4362ac..e17789b 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -643,7 +643,7 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); HRESULT WINAPI UrlCanonicalizeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlCanonicalizeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -#define UrlCanonicalize WINELIB_NAME_AW(UrlCanoncalize) +#define UrlCanonicalize WINELIB_NAME_AW(UrlCanonicalize) HRESULT WINAPI UrlCombineA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlCombineW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD);

1 0