April 2016 - Wine-Commits - list.winehq.org

Caron Wills : wined3d: Add Nvidia GeForce GTX 870M.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 7c18fe17c76efd7d7a2b2648c48e5990c2ae780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c18fe17c76efd7d7a2b2648c… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 20 16:15:18 2016 +0000 wined3d: Add Nvidia GeForce GTX 870M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f80225..1bb7182 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1293,6 +1293,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1755,6 +1756,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7421368..7863c8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1801,6 +1801,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_845M = 0x1344, CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ + CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Nikolay Sivov : dwrite: Fix IDWriteFont3 QueryInterface to respond to its own IID.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: e7667fa2b737a00efe72764a10c534f4335cb8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7667fa2b737a00efe72764a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:18 2016 +0300 dwrite: Fix IDWriteFont3 QueryInterface to respond to its own IID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 24ee58c..0b5438e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1243,7 +1243,8 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IDWriteFont2) || + if (IsEqualIID(riid, &IID_IDWriteFont3) || + IsEqualIID(riid, &IID_IDWriteFont2) || IsEqualIID(riid, &IID_IDWriteFont1) || IsEqualIID(riid, &IID_IDWriteFont) || IsEqualIID(riid, &IID_IUnknown))

1 0

Michael Stefaniuc : comdlg32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 69f6493a8c74534b29a6b49990b2360b32054c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f6493a8c74534b29a6b4999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:51:07 2016 +0200 comdlg32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 344a356..ed2615d 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1173,9 +1173,7 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); hdc = BeginPaint( hDlg, &ps ); - TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase, - ps.rcPaint.left, ps.rcPaint.top, - ps.rcPaint.right, ps.rcPaint.bottom); + TRACE("erase %d, rect=%s\n", ps.fErase, wine_dbgstr_rect(&ps.rcPaint)); /* Paint frame */ DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST );

1 0

Alex Henrie : ole32/tests: Add tests for StgCreatePropStg and StgOpenPropStg.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 6e012b52cd210f16df87961ec58c57179be7046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e012b52cd210f16df87961ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:24 2016 -0600 ole32/tests: Add tests for StgCreatePropStg and StgOpenPropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/stg_prop.c | 166 ++++++++++++++++++++++++++++++++------------ 1 file changed, 123 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e012b52cd210f16df879…

1 0

Nikolay Sivov : dwrite: Implement IDWriteFont3::HasCharacter().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 9777c77a573267af829810fc021029df2d2b85b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9777c77a573267af829810fc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:19 2016 +0300 dwrite: Implement IDWriteFont3::HasCharacter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- dlls/dwrite/tests/font.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0b5438e..f579e19 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1518,8 +1518,12 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(0x%x): stub\n", This, ch); - return FALSE; + BOOL ret; + + TRACE("(%p)->(0x%x)\n", This, ch); + + IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); + return ret; } static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f8f878c..ae6cbcf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5810,7 +5810,6 @@ static void test_HasCharacter(void) ok(hr == S_OK, "got 0x%08x\n", hr); ret = IDWriteFont3_HasCharacter(font3, 'A'); - todo_wine ok(ret, "got %d\n", ret); IDWriteFont3_Release(font3);

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in device_clear_render_targets().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: a010a0edd8ece039caceb6c05bb56aa05ed6cd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a010a0edd8ece039caceb6c05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 20 19:29:15 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c44e911..ddd2d83 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -292,8 +292,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c float depth, DWORD stencil) { struct wined3d_surface *target = rt_count ? wined3d_rendertarget_view_get_surface(fb->render_targets[0]) : NULL; - struct wined3d_surface *depth_stencil = fb->depth_stencil - ? wined3d_rendertarget_view_get_surface(fb->depth_stencil) : NULL; + struct wined3d_rendertarget_view *dsv = fb->depth_stencil; + struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; const struct wined3d_state *state = &device->state; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; @@ -331,7 +331,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) surface_load_location(rt, context, rtv->resource->draw_binding); else - wined3d_surface_prepare(rt, context, rtv->resource->draw_binding); + wined3d_texture_prepare_location(rt->container, rtv->sub_resource_idx, + context, rtv->resource->draw_binding); } } @@ -350,11 +351,12 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } if (depth_stencil && render_offscreen) - wined3d_surface_prepare(depth_stencil, context, depth_stencil->container->resource.draw_binding); + wined3d_texture_prepare_location(depth_stencil->container, + dsv->sub_resource_idx, context, dsv->resource->draw_binding); if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? fb->depth_stencil->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; if (!render_offscreen && depth_stencil != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, depth_stencil); @@ -386,7 +388,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? fb->depth_stencil->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; surface_modify_ds_location(depth_stencil, location, ds_rect.right, ds_rect.bottom);

1 0

Michael Stefaniuc : uxtheme: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 3c3fccacf021a036713619786b5cc7355bbceedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3fccacf021a036713619786… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:46:02 2016 +0200 uxtheme: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index e3d3679..730a26c 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1747,7 +1747,7 @@ HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME hTheme, HDC hdc, int iPartId /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pContentRect)); return S_OK; } @@ -1795,7 +1795,7 @@ HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId, /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pExtentRect)); return S_OK; }

1 0

Michael Stefaniuc : gdi32: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 4b7adc087adc95ab11d6f1aded70e111d5af7f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7adc087adc95ab11d6f1ade… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:30:41 2016 +0200 gdi32: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 11 +++++------ dlls/gdi32/region.c | 10 +++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 32d5e10..17ccd1f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1138,9 +1138,9 @@ BOOL WINAPI PlayEnhMetaFileRecord( rc.top = pExtTextOutA->emrtext.rcl.top; rc.right = pExtTextOutA->emrtext.rcl.right; rc.bottom = pExtTextOutA->emrtext.rcl.bottom; - TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n", + TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %s. flags %08x\n", pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y, - rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions); + wine_dbgstr_rect(&rc), pExtTextOutA->emrtext.fOptions); old_mode = SetGraphicsMode(hdc, pExtTextOutA->iGraphicsMode); /* Reselect the font back into the dc so that the transformation @@ -1174,9 +1174,9 @@ BOOL WINAPI PlayEnhMetaFileRecord( rc.top = pExtTextOutW->emrtext.rcl.top; rc.right = pExtTextOutW->emrtext.rcl.right; rc.bottom = pExtTextOutW->emrtext.rcl.bottom; - TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n", + TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d. rect = %s. flags %08x\n", pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y, - rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions); + wine_dbgstr_rect(&rc), pExtTextOutW->emrtext.fOptions); old_mode = SetGraphicsMode(hdc, pExtTextOutW->iGraphicsMode); /* Reselect the font back into the dc so that the transformation @@ -2214,8 +2214,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( tmprc.left = tmprc.top = 0; tmprc.right = tmprc.bottom = 1000; LPtoDP(hdc, (POINT*)&tmprc, 2); - TRACE("L:0,0 - 1000,1000 -> D:%d,%d - %d,%d\n", tmprc.left, - tmprc.top, tmprc.right, tmprc.bottom); + TRACE("L:0,0 - 1000,1000 -> D:%s\n", wine_dbgstr_rect(&tmprc)); return TRUE; } diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index a5df6f1..47daab9 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -422,12 +422,9 @@ static void REGION_DumpRegion(WINEREGION *pReg) { RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects; - TRACE("Region %p: %d,%d - %d,%d %d rects\n", pReg, - pReg->extents.left, pReg->extents.top, - pReg->extents.right, pReg->extents.bottom, pReg->numRects); + TRACE("Region %p: %s %d rects\n", pReg, wine_dbgstr_rect(&pReg->extents), pReg->numRects); for(pRect = pReg->rects; pRect < pRectEnd; pRect++) - TRACE("\t%d,%d - %d,%d\n", pRect->left, pRect->top, - pRect->right, pRect->bottom); + TRACE("\t%s\n", wine_dbgstr_rect(pRect)); return; } @@ -569,8 +566,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect ) rect->top = obj->extents.top; rect->right = obj->extents.right; rect->bottom = obj->extents.bottom; - TRACE("%p (%d,%d-%d,%d)\n", hrgn, - rect->left, rect->top, rect->right, rect->bottom); + TRACE("%p %s\n", hrgn, wine_dbgstr_rect(rect)); ret = get_region_type( obj ); GDI_ReleaseObj(hrgn); return ret;

1 0

Alex Henrie : ole32: Implement StgOpenPropStg.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: b045d726314aff340384798463db36044cbaa897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b045d726314aff34038479846… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:26 2016 -0600 ole32: Implement StgOpenPropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7120daf..eab8664 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -270,6 +270,7 @@ @ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenAsyncDocfileOnIFillLockBytes +@ stdcall StgOpenPropStg(ptr ptr long long ptr) @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c3db945..04e0244 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2810,3 +2810,46 @@ end: TRACE("returning 0x%08x\n", r); return r; } + +HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, + DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %08x %d %p\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to open a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructFromStream(stm, fmt, + STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0

Alex Henrie : ole32: Implement StgCreatePropStg.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 004e9f94e15020be35763324a8a311dfc3361cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=004e9f94e15020be35763324a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:25 2016 -0600 ole32: Implement StgCreatePropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c836176..7120daf 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -263,6 +263,7 @@ @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) +@ stdcall StgCreatePropStg(ptr ptr ptr long long ptr) @ stdcall StgCreateStorageEx(wstr long long long ptr ptr ptr ptr) @ stub StgGetIFillLockBytesOnFile @ stub StgGetIFillLockBytesOnILockBytes diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index da361ce..c3db945 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2767,3 +2767,46 @@ SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *p return NULL; } + +HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, + DWORD flags, DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %s %08x %d %p\n", unk, debugstr_guid(fmt), debugstr_guid(clsid), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to create a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructEmpty(stm, fmt, flags, + STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0