July 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Implement RtlExitUserProcess.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 3799d55d9b629d4733815d73a350e2ee868b98e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799d55d9b629d4733815d73a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 19 12:15:15 2013 +0200 ntdll: Implement RtlExitUserProcess. --- dlls/kernel32/process.c | 20 ++------------------ dlls/ntdll/loader.c | 14 ++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6d2f80d..6ce43d8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2624,30 +2624,14 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr ".byte 0x6A, 0x00\n\t" /* pushl $0 */ ".byte 0x68, 0x00, 0x00, 0x00, 0x00\n\t" /* pushl $0 - 4 bytes immediate */ "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("process_ExitProcess") __ASM_STDCALL(4) "\n\t" + "call " __ASM_NAME("RtlExitUserProcess") __ASM_STDCALL(4) "\n\t" "leave\n\t" "ret $4" ) - -void WINAPI process_ExitProcess( DWORD status ) -{ - ULONG magic; - LdrLockLoaderLock( 0, 0, &magic ); - RtlAcquirePebLock(); - NtTerminateProcess(0, status); - LdrShutdownProcess(); - NtTerminateProcess(GetCurrentProcess(), status); - exit(status); -} - #else void WINAPI ExitProcess( DWORD status ) { - RtlAcquirePebLock(); - NtTerminateProcess(0, status); - LdrShutdownProcess(); - NtTerminateProcess(GetCurrentProcess(), status); - exit(status); + RtlExitUserProcess( status ); } #endif diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c4d7487..b3abad0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2392,6 +2392,20 @@ void WINAPI LdrShutdownProcess(void) process_detach(); } + +/****************************************************************** + * RtlExitUserProcess (NTDLL.@) + */ +void WINAPI RtlExitUserProcess( DWORD status ) +{ + RtlEnterCriticalSection( &loader_section ); + RtlAcquirePebLock(); + NtTerminateProcess( 0, status ); + LdrShutdownProcess(); + NtTerminateProcess( GetCurrentProcess(), status ); + exit( status ); +} + /****************************************************************** * LdrShutdownThread (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3d4fa2e..0d4d62d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -568,6 +568,7 @@ @ stdcall RtlEqualString(ptr ptr long) @ stdcall RtlEqualUnicodeString(ptr ptr long) @ stdcall RtlEraseUnicodeString(ptr) +@ stdcall RtlExitUserProcess(long) @ stdcall RtlExitUserThread(long) @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) @ stub RtlExtendHeap diff --git a/include/winternl.h b/include/winternl.h index b45a56c..955228a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2347,6 +2347,7 @@ NTSYSAPI BOOL WINAPI RtlEqualPrefixSid(PSID,PSID); NTSYSAPI BOOL WINAPI RtlEqualSid(PSID,PSID); NTSYSAPI BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserProcess(ULONG); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); NTSYSAPI NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFindActivationContextSectionString(ULONG,const GUID*,ULONG,const UNICODE_STRING*,PVOID);

1 0

Nikolay Sivov : windowscodecs: Added IWICBitmapClipper stub.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 5d4c614c05a950e3597243639954db0dca07f612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4c614c05a950e3597243639… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 18 17:30:54 2013 +0400 windowscodecs: Added IWICBitmapClipper stub. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clipper.c | 160 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 8c06088..61f02c4 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ bitmap.c \ bmpdecode.c \ bmpencode.c \ + clipper.c \ clsfactory.c \ colorcontext.c \ colortransform.c \ diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c new file mode 100644 index 0000000..cbbb255 --- /dev/null +++ b/dlls/windowscodecs/clipper.c @@ -0,0 +1,160 @@ +/* + * Copyright 2013 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BitmapClipper { + IWICBitmapClipper IWICBitmapClipper_iface; + LONG ref; +} BitmapClipper; + +static inline BitmapClipper *impl_from_IWICBitmapClipper(IWICBitmapClipper *iface) +{ + return CONTAINING_RECORD(iface, BitmapClipper, IWICBitmapClipper_iface); +} + +static HRESULT WINAPI BitmapClipper_QueryInterface(IWICBitmapClipper *iface, REFIID iid, + void **ppv) +{ + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapClipper, iid)) + { + *ppv = &This->IWICBitmapClipper_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapClipper_AddRef(IWICBitmapClipper *iface) +{ + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) +{ + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BitmapClipper_GetSize(IWICBitmapClipper *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, + WICPixelFormatGUID *format) +{ + FIXME("(%p,%p): stub\n", iface, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface, + double *dpi_x, double *dpi_y) +{ + FIXME("(%p,%p,%p): stub\n", iface, dpi_x, dpi_y); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_CopyPalette(IWICBitmapClipper *iface, + IWICPalette *palette) +{ + FIXME("(%p,%p): stub\n", iface, palette); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_CopyPixels(IWICBitmapClipper *iface, + const WICRect *rc, UINT stride, UINT buffer_size, BYTE *buffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, rc, stride, buffer_size, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_Initialize(IWICBitmapClipper *iface, + IWICBitmapSource *source, const WICRect *rc) +{ + FIXME("(%p,%p,%p): stub\n", iface, source, rc); + return E_NOTIMPL; +} + +static const IWICBitmapClipperVtbl BitmapClipper_Vtbl = { + BitmapClipper_QueryInterface, + BitmapClipper_AddRef, + BitmapClipper_Release, + BitmapClipper_GetSize, + BitmapClipper_GetPixelFormat, + BitmapClipper_GetResolution, + BitmapClipper_CopyPalette, + BitmapClipper_CopyPixels, + BitmapClipper_Initialize +}; + +HRESULT BitmapClipper_Create(IWICBitmapClipper **clipper) +{ + BitmapClipper *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapClipper)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapClipper_iface.lpVtbl = &BitmapClipper_Vtbl; + This->ref = 1; + + *clipper = &This->IWICBitmapClipper_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 9a6c818..e5f2125 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -437,8 +437,8 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapScaler(IWICComponentFactory * static HRESULT WINAPI ComponentFactory_CreateBitmapClipper(IWICComponentFactory *iface, IWICBitmapClipper **ppIBitmapClipper) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapClipper); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapClipper); + return BitmapClipper_Create(ppIBitmapClipper); } static HRESULT WINAPI ComponentFactory_CreateBitmapFlipRotator(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index dddb327..4a0263b 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -54,6 +54,7 @@ extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN; extern HRESULT ColorTransform_Create(IWICColorTransform **transform) DECLSPEC_HIDDEN; +extern HRESULT BitmapClipper_Create(IWICBitmapClipper **clipper) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride,

1 0

Nikolay Sivov : windowscodecs: Implement Initialize() and GetSize() for bitmap clipper.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 682ea785df053b0ec41e18b3f2b275b5b6362b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=682ea785df053b0ec41e18b3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 00:21:33 2013 +0400 windowscodecs: Implement Initialize() and GetSize() for bitmap clipper. --- dlls/windowscodecs/clipper.c | 60 +++++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/bitmap.c | 41 +++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index cbbb255..f6d5e02 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapClipper { IWICBitmapClipper IWICBitmapClipper_iface; LONG ref; + IWICBitmapSource *source; + WICRect rect; + CRITICAL_SECTION lock; /* must be held when initialized */ } BitmapClipper; static inline BitmapClipper *impl_from_IWICBitmapClipper(IWICBitmapClipper *iface) @@ -84,6 +87,9 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + if (This->source) IWICBitmapSource_Release(This->source); HeapFree(GetProcessHeap(), 0, This); } @@ -91,10 +97,22 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) } static HRESULT WINAPI BitmapClipper_GetSize(IWICBitmapClipper *iface, - UINT *puiWidth, UINT *puiHeight) + UINT *width, UINT *height) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + + TRACE("(%p,%p,%p)\n", iface, width, height); + + if (!width || !height) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + *width = This->rect.Width; + *height = This->rect.Height; + + return S_OK; } static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, @@ -128,8 +146,37 @@ static HRESULT WINAPI BitmapClipper_CopyPixels(IWICBitmapClipper *iface, static HRESULT WINAPI BitmapClipper_Initialize(IWICBitmapClipper *iface, IWICBitmapSource *source, const WICRect *rc) { - FIXME("(%p,%p,%p): stub\n", iface, source, rc); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + UINT width, height; + HRESULT hr = S_OK; + + TRACE("(%p,%p,%p)\n", iface, source, rc); + + EnterCriticalSection(&This->lock); + + if (This->source) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + hr = IWICBitmapSource_GetSize(source, &width, &height); + if (FAILED(hr)) goto end; + + if ((rc->X + rc->Width > width) || (rc->Y + rc->Height > height)) + { + hr = E_INVALIDARG; + goto end; + } + + This->rect = *rc; + This->source = source; + IWICBitmapSource_AddRef(This->source); + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICBitmapClipperVtbl BitmapClipper_Vtbl = { @@ -153,6 +200,9 @@ HRESULT BitmapClipper_Create(IWICBitmapClipper **clipper) This->IWICBitmapClipper_iface.lpVtbl = &BitmapClipper_Vtbl; This->ref = 1; + This->source = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BitmapClipper.lock"); *clipper = &This->IWICBitmapClipper_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 5b78bf9..0437c7d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -769,6 +769,46 @@ todo_wine DeleteObject(hpal); } +static void test_clipper(void) +{ + IWICBitmapClipper *clipper; + UINT height, width; + IWICBitmap *bitmap; + WICRect rect; + HRESULT hr; + + hr = IWICImagingFactory_CreateBitmap(factory, 10, 10, &GUID_WICPixelFormat24bppBGR, + WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWICImagingFactory_CreateBitmapClipper(factory, &clipper); + ok(hr == S_OK, "got 0x%08x\n", hr); + + rect.X = rect.Y = 0; + rect.Width = rect.Height = 11; + hr = IWICBitmapClipper_Initialize(clipper, (IWICBitmapSource*)bitmap, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + rect.X = rect.Y = 5; + rect.Width = rect.Height = 6; + hr = IWICBitmapClipper_Initialize(clipper, (IWICBitmapSource*)bitmap, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + rect.X = rect.Y = 5; + rect.Width = rect.Height = 5; + hr = IWICBitmapClipper_Initialize(clipper, (IWICBitmapSource*)bitmap, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + + width = height = 0; + hr = IWICBitmapClipper_GetSize(clipper, &width, &height); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(width == 5, "got %d\n", width); + ok(height == 5, "got %d\n", height); + + IWICBitmapClipper_Release(clipper); + IWICBitmap_Release(bitmap); +} + START_TEST(bitmap) { HRESULT hr; @@ -784,6 +824,7 @@ START_TEST(bitmap) test_CreateBitmapFromMemory(); test_CreateBitmapFromHICON(); test_CreateBitmapFromHBITMAP(); + test_clipper(); IWICImagingFactory_Release(factory);

1 0

Dmitry Timoshkov : windowscodecs: Generate global GIF palette even a real one is missing.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 3738c6b05c8c130adf409c7c982b633fd058dc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3738c6b05c8c130adf409c7c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 15:29:58 2013 +0900 windowscodecs: Generate global GIF palette even a real one is missing. --- dlls/windowscodecs/gifformat.c | 39 ++++++++++++++++++++++----------- dlls/windowscodecs/tests/gifformat.c | 1 - 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 8ebcf3d..39de709 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1180,26 +1180,39 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet GifDecoder *This = impl_from_IWICBitmapDecoder(iface); WICColor colors[256]; ColorMapObject *cm; - int i, trans; + int i, trans, count; ExtensionBlock *eb; TRACE("(%p,%p)\n", iface, palette); cm = This->gif->SColorMap; - if (!cm) return WINCODEC_ERR_FRAMEMISSING; - - if (cm->ColorCount > 256) + if (cm) { - ERR("GIF contains invalid number of colors: %d\n", cm->ColorCount); - return E_FAIL; - } + if (cm->ColorCount > 256) + { + ERR("GIF contains invalid number of colors: %d\n", cm->ColorCount); + return E_FAIL; + } - for (i = 0; i < cm->ColorCount; i++) + for (i = 0; i < cm->ColorCount; i++) + { + colors[i] = 0xff000000 | /* alpha */ + cm->Colors[i].Red << 16 | + cm->Colors[i].Green << 8 | + cm->Colors[i].Blue; + } + + count = cm->ColorCount; + } + else { - colors[i] = 0xff000000 | /* alpha */ - cm->Colors[i].Red << 16 | - cm->Colors[i].Green << 8 | - cm->Colors[i].Blue; + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + + for (i = 2; i < 256; i++) + colors[i] = 0xff000000; + + count = 256; } /* look for the transparent color extension */ @@ -1217,7 +1230,7 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet } } - return IWICPalette_InitializeCustom(palette, colors, cm->ColorCount); + return IWICPalette_InitializeCustom(palette, colors, count); } static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 47a27dd..0ff0f61 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -284,7 +284,6 @@ static void test_local_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); -todo_wine ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING), "CopyPalette %#x\n", hr); if (hr == S_OK) {

1 0

Nikolay Sivov : msxml3/tests: Fix test failures with IObjectWithSite.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 47159b6a66533f145ef49b94c560d3909742084e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47159b6a66533f145ef49b94c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 08:16:21 2013 +0400 msxml3/tests: Fix test failures with IObjectWithSite. This fixes test failure on Win8 that apparently implements it same way as wine does. Refcount tests are removed, added corresponding broken condition. >From 77c26c7a1a7a0fc63a89f3515f748752b679c891 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri, 19 Jul 2013 08:16:21 +0400 Subject: [PATCH 26/26] Fix test failures with IObjectWithSite --- dlls/msxml3/tests/httpreq.c | 38 ++++---------------------------------- 1 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5c62772..0aaf7d4 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1687,58 +1687,28 @@ static void test_XMLHTTP(void) IDispatch_Release(event); /* interaction with object site */ - EXPECT_REF(xhr, 1); hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); EXPECT_HR(hr, S_OK); -todo_wine { - EXPECT_REF(xhr, 1); - EXPECT_REF(obj_site, 1); -} hr = IObjectWithSite_SetSite(obj_site, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - IObjectWithSite_AddRef(obj_site); -todo_wine { - EXPECT_REF(obj_site, 2); - EXPECT_REF(xhr, 1); -} - IObjectWithSite_Release(obj_site); - hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site2); EXPECT_HR(hr, S_OK); -todo_wine { - EXPECT_REF(xhr, 1); - EXPECT_REF(obj_site, 1); - EXPECT_REF(obj_site2, 1); - ok(obj_site != obj_site2, "expected new instance\n"); -} - IObjectWithSite_Release(obj_site); + ok(obj_site == obj_site2 || broken(obj_site != obj_site2), "got new instance\n"); + IObjectWithSite_Release(obj_site2); set_xhr_site(xhr); /* try to set site another time */ - - /* to be removed once IObjectWithSite is properly separated */ SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - hr = IObjectWithSite_SetSite(obj_site2, &testsite); + hr = IObjectWithSite_SetSite(obj_site, &testsite); EXPECT_HR(hr, S_OK); - todo_wine EXPECT_REF(xhr, 1); + IObjectWithSite_Release(obj_site); IXMLHttpRequest_Release(xhr); - - /* still works after request is released */ - - /* to be removed once IObjectWithSite is properly separated */ - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - - hr = IObjectWithSite_SetSite(obj_site2, &testsite); - EXPECT_HR(hr, S_OK); - IObjectWithSite_Release(obj_site2); - free_bstrs(); }

1 0

Thomas Faber : ieframe: Use SHANDLE_PTR in IWebBrowserApp::get_HWND.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 186d8553c10e21694b9dddfd93e82eb0639ffdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186d8553c10e21694b9dddfd9… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jul 14 12:30:38 2013 +0200 ieframe: Use SHANDLE_PTR in IWebBrowserApp::get_HWND. --- dlls/ieframe/ie.c | 2 +- dlls/ieframe/tests/webbrowser.c | 4 ++-- dlls/ieframe/webbrowser.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- include/exdisp.idl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 833cf03..454eb0f 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -355,7 +355,7 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name) return E_NOTIMPL; } -static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); FIXME("(%p)->(%p)\n", This, pHWND); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1eb6119..217ff28 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2052,7 +2052,7 @@ static void test_ie_funcs(IWebBrowser2 *wb) IDispatch *disp; VARIANT_BOOL b; int i; - LONG hwnd; + SHANDLE_PTR hwnd; HRESULT hres; BSTR sName; @@ -2061,7 +2061,7 @@ static void test_ie_funcs(IWebBrowser2 *wb) hwnd = 0xdeadbeef; hres = IWebBrowser2_get_HWND(wb, &hwnd); ok(hres == E_FAIL, "get_HWND failed: %08x, expected E_FAIL\n", hres); - ok(hwnd == 0, "unexpected hwnd %x\n", hwnd); + ok(hwnd == 0, "unexpected hwnd %p\n", (PVOID)hwnd); /* MenuBar */ diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 02edfd7..55f757f 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -565,7 +565,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name) return S_OK; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { WebBrowser *This = impl_from_IWebBrowser2(iface); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 535f6cb..079b564 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4455,7 +4455,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name) return E_NOTIMPL; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { ok(0, "unexpected call\n"); return E_NOTIMPL; diff --git a/include/exdisp.idl b/include/exdisp.idl index 3e21701..3791acb 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -230,7 +230,7 @@ interface IWebBrowserApp : IWebBrowser [id(302)] HRESULT PutProperty([in] BSTR Property, [in] VARIANT vtValue); [id(303)] HRESULT GetProperty([in] BSTR Property, [out, retval] VARIANT *pvtValue); [id(0), propget] HRESULT Name([out, retval] BSTR* Name); - [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); + [id(DISPID_HWND), propget] HRESULT HWND([out, retval] SHANDLE_PTR *pHWND); [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); [id(401), propget] HRESULT Path([out, retval] BSTR* Path); [id(402), propget] HRESULT Visible([out, retval] VARIANT_BOOL* pBool);

1 0

Dmitry Timoshkov : windowscodecs/tests: Add a test for global GIF palette exposed by recent Windows versions.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: f6c73a227b0fa2422dd53ad9debfc76bd06809d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c73a227b0fa2422dd53ad9d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 15:26:31 2013 +0900 windowscodecs/tests: Add a test for global GIF palette exposed by recent Windows versions. --- dlls/windowscodecs/tests/gifformat.c | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 9ff1d90..47a27dd 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -271,8 +271,9 @@ static void test_local_gif_palette(void) IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICPalette *palette; + WICBitmapPaletteType type; GUID format; - UINT count, ret; + UINT count, ret, i; WICColor color[256]; decoder = create_decoder(gif_local_palette, sizeof(gif_local_palette)); @@ -283,8 +284,28 @@ static void test_local_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); - ok(hr == WINCODEC_ERR_FRAMEMISSING, - "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); +todo_wine + ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING), "CopyPalette %#x\n", hr); + if (hr == S_OK) + { + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff000000, "expected 0xff000000, got %#x\n", color[0]); + ok(color[1] == 0x00ffffff, "expected 0x00ffffff, got %#x\n", color[1]); + + for (i = 2; i < 256; i++) + ok(color[i] == 0xff000000, "expected 0xff000000, got %#x\n", color[i]); + } /* frame palette */ hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); @@ -302,6 +323,11 @@ static void test_local_gif_palette(void) ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 4, "expected 4, got %u\n", count); + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + hr = IWICPalette_GetColors(palette, count, color, &ret); ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret);

1 0

Nikolay Sivov : windowscodecs: Implement GetResolution() for bitmap clipper .
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: fa12cffa9d6c17c63caa6fb307c7bda1e4eb344f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa12cffa9d6c17c63caa6fb30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 00:31:09 2013 +0400 windowscodecs: Implement GetResolution() for bitmap clipper. --- dlls/windowscodecs/clipper.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index 91d234e..d8f4b32 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -131,10 +131,19 @@ static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, } static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface, - double *dpi_x, double *dpi_y) + double *dpiX, double *dpiY) { - FIXME("(%p,%p,%p): stub\n", iface, dpi_x, dpi_y); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + + TRACE("(%p,%p,%p)\n", iface, dpiX, dpiY); + + if (!dpiX || !dpiY) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_GetResolution(This->source, dpiX, dpiY); } static HRESULT WINAPI BitmapClipper_CopyPalette(IWICBitmapClipper *iface,

1 0

Dmitry Timoshkov : gdiplus/tests: Test how device to world transform correlates with clipping region bounding rectangle .
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: c8ebd4ade064cef7aea658973f71443c8121ea8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ebd4ade064cef7aea658973… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 11:33:49 2013 +0900 gdiplus/tests: Test how device to world transform correlates with clipping region bounding rectangle. --- dlls/gdiplus/tests/graphics.c | 214 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8ebd4ade064cef7aea65…

1 0

Marcus Meissner : xcopy: fclose filedescriptor on eof case (Coverity).
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: ba7b56b22518f6e1c68267e25f3f29a320a38d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7b56b22518f6e1c68267e25… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jul 15 21:33:32 2013 +0200 xcopy: fclose filedescriptor on eof case (Coverity). --- programs/xcopy/xcopy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 7a68831..f894b0e 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -291,6 +291,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { if (!feof(inFile)) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); *endOfName = endChar; + fclose(inFile); return TRUE; }

1 0