March 2016 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Get rid of texture_ops.texture_sub_resource_add_dirty_region().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: a7f7532de393339ce23ef5b01364fe32422c089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f7532de393339ce23ef5b01… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 15 16:55:15 2016 +0100 wined3d: Get rid of texture_ops.texture_sub_resource_add_dirty_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 49 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cdde12c..4d2a94f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -505,8 +505,15 @@ void wined3d_texture_load(struct wined3d_texture *texture, TRACE("Reloading because of color key value change.\n"); for (i = 0; i < sub_count; i++) - texture->texture_ops->texture_sub_resource_add_dirty_region(texture->sub_resources[i].resource, NULL); - wined3d_texture_set_dirty(texture); + { + struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; + + if (!texture->texture_ops->texture_load_location(texture, i, context, sub_resource->map_binding)) + ERR("Failed to load location %s.\n", wined3d_debug_location(sub_resource->map_binding)); + else + texture->texture_ops->texture_sub_resource_invalidate_location(sub_resource, + ~sub_resource->map_binding); + } texture->async.gl_color_key = texture->async.src_blt_color_key; } @@ -878,16 +885,30 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { struct wined3d_resource *sub_resource; + struct wined3d_context *context; + unsigned int sub_resource_idx; TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture, layer * texture->level_count))) + sub_resource_idx = layer * texture->level_count; + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; } - texture->texture_ops->texture_sub_resource_add_dirty_region(sub_resource, dirty_region); + if (dirty_region) + FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); + + context = context_acquire(texture->resource.device, NULL); + if (!texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, sub_resource->map_binding)) + { + ERR("Failed to load location %s.\n", wined3d_debug_location(sub_resource->map_binding)); + context_release(context); + return E_OUTOFMEMORY; + } + texture->texture_ops->texture_sub_resource_invalidate_location(sub_resource, ~sub_resource->map_binding); + context_release(context); return WINED3D_OK; } @@ -933,18 +954,6 @@ static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, surface_load(surface_from_resource(sub_resource), context, srgb); } -static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, - const struct wined3d_box *dirty_region) -{ - struct wined3d_surface *surface = surface_from_resource(sub_resource); - struct wined3d_context *context; - - context = context_acquire(surface->container->resource.device, NULL); - surface_load_location(surface, context, sub_resource->map_binding); - context_release(context); - surface_invalidate_location(surface, ~sub_resource->map_binding); -} - static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) { struct wined3d_surface *surface = surface_from_resource(sub_resource); @@ -1070,7 +1079,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { texture2d_sub_resource_load, - texture2d_sub_resource_add_dirty_region, texture2d_sub_resource_invalidate_location, texture2d_sub_resource_validate_location, texture2d_sub_resource_upload_data, @@ -1558,12 +1566,6 @@ static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); } -static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, - const struct wined3d_box *dirty_region) -{ - wined3d_texture_set_dirty(volume_from_resource(sub_resource)->container); -} - static void texture3d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) { struct wined3d_volume *volume = volume_from_resource(sub_resource); @@ -1650,7 +1652,6 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { texture3d_sub_resource_load, - texture3d_sub_resource_add_dirty_region, texture3d_sub_resource_invalidate_location, texture3d_sub_resource_validate_location, texture3d_sub_resource_upload_data, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 206cac5..09fbb76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2332,8 +2332,6 @@ struct wined3d_texture_ops { void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, struct wined3d_context *context, BOOL srgb); - void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, - const struct wined3d_box *dirty_region); void (*texture_sub_resource_invalidate_location)(struct wined3d_resource *sub_resource, DWORD location); void (*texture_sub_resource_validate_location)(struct wined3d_resource *sub_resource, DWORD location); void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource,

1 0

Jens Reyer : winegcc: Document WINEBUILD in the manpage.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: d2d44610a2b66d8aff886729db03be7e7da09e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d44610a2b66d8aff886729d… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 15 17:28:00 2016 +0100 winegcc: Document WINEBUILD in the manpage. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.man.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index f4fecc7..b4fc12d 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -67,6 +67,13 @@ Do not add the winecrt0 library when linking. .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.SH ENVIRONMENT +.TP +.B WINEBUILD +Specifies the path and name of the \fBwinebuild\fR binary that will be +launched automatically by \fBwinegcc\fR. +If not set, \fBwinegcc\fR will look for a file named \fIwinebuild\fR +in the path. .SH DEFINES winegcc defines __WINE__, for code that needs to know when it is being compiled under Wine. It also defines WIN32, _WIN32, __WIN32,

1 0

Andrew Eikum : windowscodecs: Stub IWICMetadataQueryReader.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 1b8e123465a27e812ae38e8b4e595a1b856bffcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8e123465a27e812ae38e8b4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 14 13:47:00 2016 -0500 windowscodecs: Stub IWICMetadataQueryReader. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bitmap.c | 1 - dlls/windowscodecs/bmpdecode.c | 1 - dlls/windowscodecs/bmpencode.c | 1 - dlls/windowscodecs/clipper.c | 1 - dlls/windowscodecs/clsfactory.c | 2 - dlls/windowscodecs/colorcontext.c | 1 - dlls/windowscodecs/colortransform.c | 1 - dlls/windowscodecs/converter.c | 1 - dlls/windowscodecs/fliprotate.c | 1 - dlls/windowscodecs/gifformat.c | 10 ++- dlls/windowscodecs/icnsformat.c | 1 - dlls/windowscodecs/icoformat.c | 1 - dlls/windowscodecs/imgfactory.c | 10 ++- dlls/windowscodecs/info.c | 2 - dlls/windowscodecs/jpegformat.c | 1 - dlls/windowscodecs/main.c | 1 - dlls/windowscodecs/metadatahandler.c | 2 - dlls/windowscodecs/metadataquery.c | 150 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/palette.c | 1 - dlls/windowscodecs/pngformat.c | 12 ++- dlls/windowscodecs/propertybag.c | 1 - dlls/windowscodecs/proxy.c | 2 - dlls/windowscodecs/regsvr.c | 2 - dlls/windowscodecs/scaler.c | 1 - dlls/windowscodecs/stream.c | 1 - dlls/windowscodecs/tests/metadata.c | 38 +++++++++ dlls/windowscodecs/tgaformat.c | 1 - dlls/windowscodecs/tiffformat.c | 12 ++- dlls/windowscodecs/wincodecs_private.h | 5 ++ 30 files changed, 223 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b8e123465a27e812ae38…

1 0

Andrew Eikum : windowscodecs: Stub IMetadataBlockReader for jpegformat.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 70a643d05624c9f177baf678e00b86f579c26978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a643d05624c9f177baf678e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 14 13:47:08 2016 -0500 windowscodecs: Stub IMetadataBlockReader for jpegformat. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 84 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 7ee8012..b7998be 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -139,6 +139,7 @@ static void emit_message_fn(j_common_ptr cinfo, int msg_level) typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; BOOL initialized; BOOL cinfo_initialized; @@ -166,6 +167,11 @@ static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); } +static inline JpegDecoder *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, JpegDecoder, IWICMetadataBlockReader_iface); +} + static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -682,8 +688,14 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) + return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); } static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, @@ -714,6 +726,73 @@ static const IWICBitmapFrameDecodeVtbl JpegDecoder_Frame_Vtbl = { JpegDecoder_Frame_GetThumbnail }; +static HRESULT WINAPI JpegDecoder_Block_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, + void **ppv) +{ + JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI JpegDecoder_Block_AddRef(IWICMetadataBlockReader *iface) +{ + JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); +} + +static ULONG WINAPI JpegDecoder_Block_Release(IWICMetadataBlockReader *iface) +{ + JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); +} + +static HRESULT WINAPI JpegDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *pguidContainerFormat) +{ + TRACE("%p,%p\n", iface, pguidContainerFormat); + + if (!pguidContainerFormat) return E_INVALIDARG; + + memcpy(pguidContainerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)); + + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *pcCount) +{ + FIXME("%p,%p\n", iface, pcCount); + + if (!pcCount) return E_INVALIDARG; + + *pcCount = 0; + + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT nIndex, IWICMetadataReader **ppIMetadataReader) +{ + FIXME("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); + return E_INVALIDARG; +} + +static HRESULT WINAPI JpegDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **ppIEnumMetadata) +{ + FIXME("%p,%p\n", iface, ppIEnumMetadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl JpegDecoder_Block_Vtbl = { + JpegDecoder_Block_QueryInterface, + JpegDecoder_Block_AddRef, + JpegDecoder_Block_Release, + JpegDecoder_Block_GetContainerFormat, + JpegDecoder_Block_GetCount, + JpegDecoder_Block_GetReaderByIndex, + JpegDecoder_Block_GetEnumerator, +}; + HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) { JpegDecoder *This; @@ -734,6 +813,7 @@ HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) This->IWICBitmapDecoder_iface.lpVtbl = &JpegDecoder_Vtbl; This->IWICBitmapFrameDecode_iface.lpVtbl = &JpegDecoder_Frame_Vtbl; + This->IWICMetadataBlockReader_iface.lpVtbl = &JpegDecoder_Block_Vtbl; This->ref = 1; This->initialized = FALSE; This->cinfo_initialized = FALSE;

1 0

Nikolay Sivov : ole32/tests: Some tests for IInitializeSpy.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 254e76fc15bea29a782074d63ac68b42fdbfee53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=254e76fc15bea29a782074d63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 19:53:58 2016 +0300 ole32/tests: Some tests for IInitializeSpy. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 2 + 2 files changed, 135 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1af24b6..43556d9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3129,6 +3129,138 @@ static void test_CoGetCurrentLogicalThreadId(void) ok(!IsEqualGUID(&id, &GUID_NULL), "got null id\n"); } +static HRESULT WINAPI testinitialize_QI(IInitializeSpy *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IInitializeSpy) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IInitializeSpy_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testinitialize_AddRef(IInitializeSpy *iface) +{ + return 2; +} + +static ULONG WINAPI testinitialize_Release(IInitializeSpy *iface) +{ + return 1; +} + +static HRESULT WINAPI testinitialize_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinitialize_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinitialize_PreUninitialize(IInitializeSpy *iface, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinitialize_PostUninitialize(IInitializeSpy *iface, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IInitializeSpyVtbl testinitializevtbl = +{ + testinitialize_QI, + testinitialize_AddRef, + testinitialize_Release, + testinitialize_PreInitialize, + testinitialize_PostInitialize, + testinitialize_PreUninitialize, + testinitialize_PostUninitialize +}; + +static IInitializeSpy testinitialize = { &testinitializevtbl }; + +static void test_IInitializeSpy(void) +{ + ULARGE_INTEGER cookie, cookie1, cookie2; + HRESULT hr; + + hr = CoRegisterInitializeSpy(NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cookie.QuadPart = 1; + hr = CoRegisterInitializeSpy(NULL, &cookie); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(cookie.QuadPart == 1, "got wrong cookie\n"); + + hr = CoRegisterInitializeSpy(&testinitialize, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cookie.HighPart = 0; + cookie.LowPart = 1; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(cookie.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie.HighPart, + GetCurrentThreadId()); + ok(cookie.LowPart == 0, "got wrong low part 0x%x\n", cookie.LowPart); +} + /* register same instance one more time */ + cookie1.HighPart = 0; + cookie1.LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, + GetCurrentThreadId()); + ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); +} + cookie2.HighPart = 0; + cookie2.LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie2); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie2.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie2.HighPart, + GetCurrentThreadId()); + ok(cookie2.LowPart == 2, "got wrong low part 0x%x\n", cookie2.LowPart); +} + hr = CoRevokeInitializeSpy(cookie1); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(cookie1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cookie1.HighPart = 0; + cookie1.LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, + GetCurrentThreadId()); + ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); +} + hr = CoRevokeInitializeSpy(cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(cookie1); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(cookie2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -3198,4 +3330,5 @@ START_TEST(compobj) test_CoGetApartmentType(); test_IMallocSpy(); test_CoGetCurrentLogicalThreadId(); + test_IInitializeSpy(); } diff --git a/include/objbase.h b/include/objbase.h index 43f3357..875f0e1 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -370,6 +370,8 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID pClsidNew); HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew); HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, LPVOID lpvReserved); HRESULT WINAPI CoGetObjectContext(REFIID riid, LPVOID *ppv); +HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cookie); +HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie); HRESULT WINAPI CoCreateGuid(GUID* pguid); BOOL WINAPI CoIsOle1Class(REFCLSID rclsid);

1 0

Nikolay Sivov : xmllite/writer: Implement WriteCData().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 7b8929e0f5b235e69235f59f69d6482f346bf380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8929e0f5b235e69235f59f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 19:54:46 2016 +0300 xmllite/writer: Implement WriteCData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 51 ++++++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index a55957e..6f2232e 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -814,6 +814,72 @@ static void test_WriteComment(void) IStream_Release(stream); } +static void test_WriteCData(void) +{ + static const WCHAR closeW[] = {']',']','>',0}; + static const WCHAR close2W[] = {'a',']',']','>','b',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCData(writer, aW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCData(writer, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCData(writer, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCData(writer, closeW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCData(writer, close2W); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr != NULL, "got %p\n", ptr); + + ok(!strncmp(ptr, + "<b>" + "<![CDATA[a]]>" + "<![CDATA[]]>" + "<![CDATA[]]]]>" + "<![CDATA[>]]>" + "<![CDATA[a]]]]>" + "<![CDATA[>b]]>", 84), "got %s\n", ptr); + + GlobalUnlock(hglobal); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -829,4 +895,5 @@ START_TEST(writer) test_bom(); test_writeenddocument(); test_WriteComment(); + test_WriteCData(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 766d335..3e74389 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -556,13 +556,58 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR pwszText) +static void write_cdata_section(xmlwriteroutput *output, const WCHAR *data, int len) +{ + static const WCHAR cdataopenW[] = {'<','!','[','C','D','A','T','A','['}; + static const WCHAR cdatacloseW[] = {']',']','>'}; + write_output_buffer(output, cdataopenW, ARRAY_SIZE(cdataopenW)); + if (data) + write_output_buffer(output, data, len); + write_output_buffer(output, cdatacloseW, ARRAY_SIZE(cdatacloseW)); +} + +static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) { xmlwriter *This = impl_from_IXmlWriter(iface); + int len; - FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); + TRACE("%p %s\n", This, debugstr_w(data)); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + len = data ? strlenW(data) : 0; + + if (!len) + write_cdata_section(This->output, NULL, 0); + else { + static const WCHAR cdatacloseW[] = {']',']','>',0}; + while (len) { + const WCHAR *str = strstrW(data, cdatacloseW); + if (str) { + str += 2; + write_cdata_section(This->output, data, str - data); + len -= str - data; + data = str; + } + else { + write_cdata_section(This->output, data, len); + break; + } + } + } + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR wch)

1 0

Bruno Jesus : msrle32: Use the correct number of colors when biClrUsed = 0.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 373a02c64169d4fc039a93153b66987057fee553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=373a02c64169d4fc039a93153… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 16 01:14:11 2016 +0800 msrle32: Use the correct number of colors when biClrUsed = 0. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 2682812..6688040 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1567,8 +1567,16 @@ static LRESULT DecompressGetFormat(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, size = lpbiIn->biSize; - if (lpbiIn->biBitCount <= 8) - size += lpbiIn->biClrUsed * sizeof(RGBQUAD); + if (lpbiIn->biBitCount <= 8) { + int colors; + + if (lpbiIn->biClrUsed == 0) + colors = 1 << lpbiIn->biBitCount; + else + colors = lpbiIn->biClrUsed; + + size += colors * sizeof(RGBQUAD); + } if (lpbiOut != NULL) { memcpy(lpbiOut, lpbiIn, size); @@ -1647,27 +1655,33 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (lpbiIn->biCompression != BI_RGB) { + int colors; + + if (lpbiIn->biBitCount <= 8 && lpbiIn->biClrUsed == 0) + colors = 1 << lpbiIn->biBitCount; + else + colors = lpbiIn->biClrUsed; + rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); switch (lpbiOut->biBitCount) { case 4: case 8: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); + pi->palette_map = LocalAlloc(LPTR, colors); if (pi->palette_map == NULL) return ICERR_MEMORY; - for (i = 0; i < lpbiIn->biClrUsed; i++) { - pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); - } + for (i = 0; i < colors; i++) + pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(colors, rgbOut, rgbIn[i]); break; case 15: case 16: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); + pi->palette_map = LocalAlloc(LPTR, colors * 2); if (pi->palette_map == NULL) return ICERR_MEMORY; - for (i = 0; i < lpbiIn->biClrUsed; i++) { + for (i = 0; i < colors; i++) { WORD color; if (lpbiOut->biBitCount == 15) @@ -1683,10 +1697,10 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, break; case 24: case 32: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + pi->palette_map = LocalAlloc(LPTR, colors * sizeof(RGBQUAD)); if (pi->palette_map == NULL) return ICERR_MEMORY; - memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + memcpy(pi->palette_map, rgbIn, colors * sizeof(RGBQUAD)); break; }; }

1 0

Piotr Caban : msvcrt: Add i386 _IsExceptionObjectToBeDestroyed implementation.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 0ef61844b8307c392b4fa0a25b8fcf3ecbff8326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef61844b8307c392b4fa0a25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:40:46 2016 +0100 msvcrt: Add i386 _IsExceptionObjectToBeDestroyed implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except_arm.c | 9 ++++++++ dlls/msvcrt/except_i386.c | 27 ++++++++++++++++++++++ dlls/msvcrt/except_x86_64.c | 9 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 12 files changed, 54 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b77b73e..8674f44 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -4,7 +4,7 @@ @ stub _FindAndUnlinkFrame @ stub _GetImageBase @ stub _GetThrowImageBase -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) ucrtbase._IsExceptionObjectToBeDestroyed @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 39742aa..15a446f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -530,7 +530,7 @@ @ cdecl _Getmonths() @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c1ee3a2..ccc659f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -853,7 +853,7 @@ @ cdecl _Getmonths() @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) @ stub _Lock_shared_ptr_spin_lock @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 00efc6c..5f17e06 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -837,7 +837,7 @@ @ cdecl _Getmonths() @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) @ stub _LCbuild @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 87bf9dc..e978d20 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -831,7 +831,7 @@ @ cdecl _Getmonths() msvcr120._Getmonths @ cdecl _Gettnames() msvcr120._Gettnames @ extern _HUGE msvcr120._HUGE -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) msvcr120._IsExceptionObjectToBeDestroyed @ stub _LCbuild @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 17af90b..4df2215 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -162,7 +162,7 @@ @ cdecl _Getmonths() @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 @ stub -arch=i386 _NLG_Return diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fd08455..4bb2adb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -157,7 +157,7 @@ @ cdecl _Getmonths() @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 62dadef..2779841 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -75,6 +75,15 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, } /********************************************************************* + * _IsExceptionObjectToBeDestroyed (MSVCR80.@) + */ +BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void *obj) +{ + FIXME("%p not implemented\n", obj); + return FALSE; +} + +/********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame, CONTEXT *context, diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 1625854..660fb6d 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -415,6 +415,33 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG nested_frame->trylevel ); } +/********************************************************************* + * _IsExceptionObjectToBeDestroyed (MSVCR80.@) + */ +BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void *obj) +{ + EXCEPTION_REGISTRATION_RECORD *reg = NtCurrentTeb()->Tib.ExceptionList; + + TRACE( "%p\n", obj ); + + while (reg != (EXCEPTION_REGISTRATION_RECORD*)-1) + { + if (reg->Handler == catch_function_nested_handler) + { + EXCEPTION_RECORD *rec = ((struct catch_func_nested_frame*)reg)->rec; + + if(!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + && rec->ExceptionCode == CXX_EXCEPTION && rec->NumberParameters == 3 + && rec->ExceptionInformation[1] == (LONG_PTR)obj) + return FALSE; + } + + reg = reg->Prev; + } + + return TRUE; +} + /* find and call the appropriate catch block for an exception */ /* returns the address to continue execution to after the catch block was called */ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 27d0a15..8f0301d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -72,6 +72,15 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, } /********************************************************************* + * _IsExceptionObjectToBeDestroyed (MSVCR80.@) + */ +BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void *obj) +{ + FIXME ( "%p not implemented\n", obj ); + return FALSE; +} + +/********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 frame, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 15f3781..16540a5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -30,7 +30,7 @@ @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) @ stub _LCbuild @ stub _LCmulcc @ stub _LCmulcr diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index feb94ac..c518b15 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -2,7 +2,7 @@ @ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ stub _FindAndUnlinkFrame -@ stub _IsExceptionObjectToBeDestroyed +@ cdecl -arch=i386,x86_64,arm _IsExceptionObjectToBeDestroyed(ptr) ucrtbase._IsExceptionObjectToBeDestroyed @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2

1 0

Piotr Caban : msvcrt: Destroy exception object if it' s no longer used when exiting catch.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 941e4f7e9ded4db0f2d708f95e2b16c974f2cfdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=941e4f7e9ded4db0f2d708f95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:41:00 2016 +0100 msvcrt: Destroy exception object if it's no longer used when exiting catch. Thrown object was incorrectly freed in following situation: try { throw obj; } catch(object &obj) { try { throw; } catch(...) {} //use object here } Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 660fb6d..116a429 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -446,6 +446,7 @@ BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void *obj) /* returns the address to continue execution to after the catch block was called */ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, const cxx_function_descr *descr, int nested_trylevel, + EXCEPTION_REGISTRATION_RECORD *catch_frame, cxx_exception_type *info ) { UINT i; @@ -487,7 +488,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame } /* unwind the stack */ - RtlUnwind( frame, 0, rec, 0 ); + RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; @@ -511,7 +512,8 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame __wine_pop_frame( &nested_frame.frame ); ((DWORD*)frame)[-1] = save_esp; - if (info && info->destructor) call_dtor( info->destructor, object ); + if (info && info->destructor && _IsExceptionObjectToBeDestroyed(object)) + call_dtor( info->destructor, object ); TRACE( "done, continuing at %p\n", addr ); continue_after_catch( frame, addr ); @@ -655,7 +657,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } } - call_catch_block( rec, frame, descr, frame->trylevel, exc_type ); + call_catch_block( rec, frame, descr, frame->trylevel, nested_frame, exc_type ); return ExceptionContinueSearch; }

1 0

Piotr Caban : msvcrt: Handle try blocks inside current catch block in nested frame handler.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 2d4b48a58d8a4a79eaf922f6b9c0375a38bce9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4b48a58d8a4a79eaf922f6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:41:08 2016 +0100 msvcrt: Handle try blocks inside current catch block in nested frame handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 116a429..56165c0 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -461,6 +461,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame { const tryblock_info *tryblock = &descr->tryblock[i]; + /* only handle try blocks inside current catch block */ + if (catch_frame && nested_trylevel > tryblock->start_level) continue; + if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue;

1 0