September 2013 - Wine-Commits

Ken Thomases : winemac: Move memory management of liveResizeDisplayTimer into property setter.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: d55d2ec85a769fb5d41b61e3b64ee773bf32880c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55d2ec85a769fb5d41b61e3b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:00:51 2013 -0500 winemac: Move memory management of liveResizeDisplayTimer into property setter. --- dlls/winemac.drv/cocoa_window.m | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e8ac79c..d833d04 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -158,6 +158,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @property (assign, nonatomic) void* imeData; @property (nonatomic) BOOL commandDone; +(a)property (retain, nonatomic) NSTimer* liveResizeDisplayTimer; + - (void) updateColorSpace; - (BOOL) becameEligibleParentOrChild; @@ -468,6 +470,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; + @synthesize liveResizeDisplayTimer; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -1183,6 +1186,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self checkTransparency]; } + - (void) setLiveResizeDisplayTimer:(NSTimer*)newTimer + { + if (newTimer != liveResizeDisplayTimer) + { + [liveResizeDisplayTimer invalidate]; + [liveResizeDisplayTimer release]; + liveResizeDisplayTimer = [newTimer retain]; + } + } + - (void) makeFocused:(BOOL)activate { [self orderBelow:nil orAbove:nil activate:activate]; @@ -1463,9 +1476,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowDidEndLiveResize:(NSNotification *)notification { - [liveResizeDisplayTimer invalidate]; - [liveResizeDisplayTimer release]; - liveResizeDisplayTimer = nil; + self.liveResizeDisplayTimer = nil; } - (void)windowDidMiniaturize:(NSNotification *)notification @@ -1587,13 +1598,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) // // We address this by "manually" asking our windows to check if they need // redrawing every so often (during live resize only). - [self windowDidEndLiveResize:nil]; - liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 - target:self - selector:@selector(displayIfNeeded) - userInfo:nil - repeats:YES]; - [liveResizeDisplayTimer retain]; + self.liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 + target:self + selector:@selector(displayIfNeeded) + userInfo:nil + repeats:YES]; [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer forMode:NSRunLoopCommonModes]; }

1 0

Stefan Dösinger : wined3d: Check box dimensions in volume_map.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 2680f3301585e2263e3800454f51c8f09314926f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680f3301585e2263e3800454… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 18 12:24:57 2013 +0200 wined3d: Check box dimensions in volume_map. --- dlls/wined3d/volume.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fcab45b..2fa04c5 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -566,6 +566,28 @@ static BOOL volume_check_block_align(const struct wined3d_volume *volume, return TRUE; } +static BOOL wined3d_volume_check_box_dimensions(const struct wined3d_volume *volume, + const struct wined3d_box *box) +{ + if (!box) + return TRUE; + + if (box->left >= box->right) + return FALSE; + if (box->top >= box->bottom) + return FALSE; + if (box->front >= box->back) + return FALSE; + if (box->right > volume->resource.width) + return FALSE; + if (box->bottom > volume->resource.height) + return FALSE; + if (box->back > volume->resource.depth) + return FALSE; + + return TRUE; +} + HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { @@ -589,6 +611,11 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, WARN("Volume is already mapped.\n"); return WINED3DERR_INVALIDCALL; } + if (!wined3d_volume_check_box_dimensions(volume, box)) + { + WARN("Map box is invalid.\n"); + return WINED3DERR_INVALIDCALL; + } if ((format->flags & WINED3DFMT_FLAG_BLOCKS) && !volume_check_block_align(volume, box)) { WARN("Map box is misaligned for %ux%u blocks.\n",

1 0

Henri Verbeet : d3d10: Avoid LPVOID.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 69fe799c25eaf9780aee28d96798e9960194943c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69fe799c25eaf9780aee28d96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:13 2013 +0200 d3d10: Avoid LPVOID. --- dlls/d3d10/d3d10_main.c | 13 ++++++------- include/d3d10_1shader.h | 2 +- include/d3d10effect.h | 4 ++-- include/d3d10shader.h | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index ac3eee5..01fefba 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,16 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason=%d\n", fdwReason); - switch(fdwReason) + switch (reason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; } + return TRUE; } diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h index 92f5ebf..06dded7 100644 --- a/include/d3d10_1shader.h +++ b/include/d3d10_1shader.h @@ -27,7 +27,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10ShaderReflection1 methods */ diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 5af2ef5..1494894 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -755,7 +755,7 @@ DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0x0d, 0x8e, 0xe1 DECLARE_INTERFACE_(ID3D10Effect, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10Effect methods */ @@ -781,7 +781,7 @@ DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10EffectPool methods */ diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 894b833..4a2fef9 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -140,7 +140,7 @@ typedef struct _D3D10_SHADER_VARIABLE_DESC UINT StartOffset; UINT Size; UINT uFlags; - LPVOID DefaultValue; + void *DefaultValue; } D3D10_SHADER_VARIABLE_DESC; typedef struct _D3D10_SHADER_TYPE_DESC @@ -193,7 +193,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection, 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20, DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10ShaderReflection methods */

1 0

Qian Hong : imm32: Validate input context in multiple IMC functions.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: b4b428ee9e7cdffe6f49c2d539107fbb9d002895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b428ee9e7cdffe6f49c2d53… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Sep 17 22:52:02 2013 +0800 imm32: Validate input context in multiple IMC functions. Both tests and fixes improved by Aric Stewart. --- dlls/imm32/imm.c | 166 ++++++++++++++----- dlls/imm32/tests/imm32.c | 405 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 523 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b428ee9e7cdffe6f49c…

1 0

Jacek Caban : ieframe: Added IWebBrowserPriv2IE8 stub implementation.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 040e47feced802cee1eecf5c532673eb944cc9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040e47feced802cee1eecf5c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 16:58:13 2013 +0200 ieframe: Added IWebBrowserPriv2IE8 stub implementation. --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ include/mshtml.idl | 37 ++++++++++++++++ 3 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 777ecf9..b7da8ff 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -58,6 +58,7 @@ typedef struct { IHlinkFrame IHlinkFrame_iface; ITargetFrame2 ITargetFrame2_iface; ITargetFramePriv2 ITargetFramePriv2_iface; + IWebBrowserPriv2IE8 IWebBrowserPriv2IE8_iface; IUnknown *outer; DocHost *doc_host; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index d730b10..b57ec4b 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1451,6 +1451,109 @@ static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = { TargetFramePriv2_AggregatedNavigation2 }; +static inline HlinkFrame *impl_from_IWebBrowserPriv2IE8(IWebBrowserPriv2IE8 *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, IWebBrowserPriv2IE8_iface); +} + +static HRESULT WINAPI WebBrowserPriv2IE8_QueryInterface(IWebBrowserPriv2IE8 *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI WebBrowserPriv2IE8_AddRef(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI WebBrowserPriv2IE8_Release(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE8 *iface, IUri *uri, VARIANT *flags, + VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p %s %s %s %s %p %s)\n", This, uri, debugstr_variant(flags), debugstr_variant(target_frame), + debugstr_variant(post_data), debugstr_variant(headers), bind_ctx, debugstr_w(url_fragment)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_SetBrowserFrameOptions(IWebBrowserPriv2IE8 *iface, DWORD opt1, DWORD opt2) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%x %x)\n", This, opt1, opt2); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_DetachConnectionPoints(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_GetProcessId(IWebBrowserPriv2IE8 *iface, DWORD *pid) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p)\n", This, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_CompatAttachEditEvents(IWebBrowserPriv2IE8 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_HandleOpenOptions(IWebBrowserPriv2IE8 *iface, IUnknown *obj, BSTR bstr, int options) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p %s %x)\n", This, obj, debugstr_w(bstr), options); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_SetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR term) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(term)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_GetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR *term) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p)\n", This, term); + return E_NOTIMPL; +} + +static HRESULT WINAPI WebBrowserPriv2IE8_GetCurrentDocument(IWebBrowserPriv2IE8 *iface, IDispatch **doc) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface); + FIXME("(%p)->(%p)\n", This, doc); + return E_NOTIMPL; +} + +static const IWebBrowserPriv2IE8Vtbl WebBrowserPriv2IE8Vtbl = { + WebBrowserPriv2IE8_QueryInterface, + WebBrowserPriv2IE8_AddRef, + WebBrowserPriv2IE8_Release, + WebBrowserPriv2IE8_NavigateWithBindCtx2, + WebBrowserPriv2IE8_SetBrowserFrameOptions, + WebBrowserPriv2IE8_DetachConnectionPoints, + WebBrowserPriv2IE8_GetProcessId, + WebBrowserPriv2IE8_CompatAttachEditEvents, + WebBrowserPriv2IE8_HandleOpenOptions, + WebBrowserPriv2IE8_SetSearchTerm, + WebBrowserPriv2IE8_GetSearchTerm, + WebBrowserPriv2IE8_GetCurrentDocument +}; + BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkFrame, riid)) { @@ -1465,6 +1568,9 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_ITargetFramePriv2, riid)) { TRACE("(%p)->(IID_ITargetFramePriv2 %p)\n", This, ppv); *ppv = &This->ITargetFramePriv2_iface; + }else if(IsEqualGUID(&IID_IWebBrowserPriv2IE8, riid)) { + TRACE("(%p)->(IID_IWebBrowserPriv2IE8 %p)\n", This, ppv); + *ppv = &This->IWebBrowserPriv2IE8_iface; }else { return FALSE; } @@ -1478,6 +1584,7 @@ void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; + This->IWebBrowserPriv2IE8_iface.lpVtbl = &WebBrowserPriv2IE8Vtbl; This->outer = outer; This->doc_host = doc_host; diff --git a/include/mshtml.idl b/include/mshtml.idl index f64eb98..19607d1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18516,3 +18516,40 @@ interface IHTMLPrivateWindow : IUnknown HRESULT FindWindowByName(LPCWSTR name, IHTMLWindow2 **ret); HRESULT GetAddressBarUrl(BSTR *url); } + +/***************************************************************************** + * IWebBrowserPriv interface + */ +[ + object, + uuid(3050f804-98b5-11cf-bb82-00aa00bdce0b), + local +] +interface IWebBrowserPriv : IUnknown +{ + HRESULT NavigateWithBindCtx(VARIANT *uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment); + HRESULT OnClose(); +} + +/***************************************************************************** + * IWebBrowserPriv2IE8 interface + */ +[ + object, + uuid(3ed72303-6ffc-4214-ba90-faf1862dec8a), + local +] +interface IWebBrowserPriv2IE8 : IUnknown +{ + HRESULT NavigateWithBindCtx2(IUri *uri, VARIANT *flags, VARIANT *target_frame, VARIANT *post_data, + VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment); + HRESULT SetBrowserFrameOptions(DWORD opt1, DWORD opt2); + HRESULT DetachConnectionPoints(); + HRESULT GetProcessId(DWORD *pid); + HRESULT CompatAttachEditEvents(); + HRESULT HandleOpenOptions(IUnknown *obj, BSTR bstr, int options); + HRESULT SetSearchTerm(BSTR term); + HRESULT GetSearchTerm(BSTR *term); + HRESULT GetCurrentDocument(IDispatch** doc); +}

1 0

Dmitry Timoshkov : windowscodecs: Implement CreateBitmapFromHBITMAP.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: c6d62ff081410eed07b3e788c8c4539f0fc36b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d62ff081410eed07b3e788c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 16 17:28:07 2013 +0900 windowscodecs: Implement CreateBitmapFromHBITMAP. --- dlls/windowscodecs/imgfactory.c | 149 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 14 ++- 2 files changed, 154 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e5f2125..bb4cf67 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -603,12 +603,153 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFacto return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); } +static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format) +{ + BOOL ret = TRUE; + BITMAPV4HEADER bmh; + HDC hdc; + + hdc = CreateCompatibleDC(0); + + memset(&bmh, 0, sizeof(bmh)); + bmh.bV4Size = sizeof(bmh); + bmh.bV4Width = 1; + bmh.bV4Height = 1; + bmh.bV4V4Compression = BI_BITFIELDS; + bmh.bV4BitCount = 16; + + GetDIBits(hdc, hbm, 0, 0, NULL, (BITMAPINFO *)&bmh, DIB_RGB_COLORS); + + if (bmh.bV4RedMask == 0x7c00 && + bmh.bV4GreenMask == 0x3e0 && + bmh.bV4BlueMask == 0x1f) + { + *format = GUID_WICPixelFormat16bppBGR555; + } + else if (bmh.bV4RedMask == 0xf800 && + bmh.bV4GreenMask == 0x7e0 && + bmh.bV4BlueMask == 0x1f) + { + *format = GUID_WICPixelFormat16bppBGR565; + } + else + { + FIXME("unrecognized bitfields %x,%x,%x\n", bmh.bV4RedMask, + bmh.bV4GreenMask, bmh.bV4BlueMask); + ret = FALSE; + } + + DeleteDC(hdc); + return ret; +} + static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, - HBITMAP hBitmap, HPALETTE hPalette, WICBitmapAlphaChannelOption options, - IWICBitmap **ppIBitmap) + HBITMAP hbm, HPALETTE hpal, WICBitmapAlphaChannelOption option, IWICBitmap **bitmap) { - FIXME("(%p,%p,%p,%u,%p): stub\n", iface, hBitmap, hPalette, options, ppIBitmap); - return E_NOTIMPL; + BITMAP bm; + HRESULT hr; + WICPixelFormatGUID format; + IWICBitmapLock *lock; + UINT size, num_palette_entries = 0; + PALETTEENTRY entry[256]; + + TRACE("(%p,%p,%p,%u,%p)\n", iface, hbm, hpal, option, bitmap); + + if (!bitmap) return E_INVALIDARG; + + if (GetObjectW(hbm, sizeof(bm), &bm) != sizeof(bm)) + return WINCODEC_ERR_WIN32ERROR; + + if (hpal) + { + num_palette_entries = GetPaletteEntries(hpal, 0, 256, entry); + if (!num_palette_entries) + return WINCODEC_ERR_WIN32ERROR; + } + + /* TODO: Figure out the correct format for 16, 32, 64 bpp */ + switch(bm.bmBitsPixel) + { + case 1: + format = GUID_WICPixelFormat1bppIndexed; + break; + case 4: + format = GUID_WICPixelFormat4bppIndexed; + break; + case 8: + format = GUID_WICPixelFormat8bppIndexed; + break; + case 16: + if (!get_16bpp_format(hbm, &format)) + return E_INVALIDARG; + break; + case 24: + format = GUID_WICPixelFormat24bppBGR; + break; + case 32: + format = GUID_WICPixelFormat32bppBGR; + break; + case 48: + format = GUID_WICPixelFormat48bppRGB; + break; + default: + FIXME("unsupported %d bpp\n", bm.bmBitsPixel); + return E_INVALIDARG; + } + + hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, option, bitmap); + if (hr != S_OK) return hr; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (hr == S_OK) + { + BYTE *buffer; + HDC hdc; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + + IWICBitmapLock_GetDataPointer(lock, &size, &buffer); + + hdc = CreateCompatibleDC(0); + + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biBitCount = 0; + GetDIBits(hdc, hbm, 0, 0, NULL, bmi, DIB_RGB_COLORS); + bmi->bmiHeader.biHeight = -bm.bmHeight; + GetDIBits(hdc, hbm, 0, bm.bmHeight, buffer, bmi, DIB_RGB_COLORS); + + DeleteDC(hdc); + IWICBitmapLock_Release(lock); + + if (num_palette_entries) + { + IWICPalette *palette; + WICColor colors[256]; + UINT i; + + hr = PaletteImpl_Create(&palette); + if (hr == S_OK) + { + for (i = 0; i < num_palette_entries; i++) + colors[i] = 0xff000000 | entry[i].peRed << 16 | + entry[i].peGreen << 8 | entry[i].peBlue; + + hr = IWICPalette_InitializeCustom(palette, colors, num_palette_entries); + if (hr == S_OK) + hr = IWICBitmap_SetPalette(*bitmap, palette); + + IWICPalette_Release(palette); + } + } + } + + if (hr != S_OK) + { + IWICBitmap_Release(*bitmap); + *bitmap = NULL; + } + + return hr; } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 8795048..3c79ce8 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -727,17 +727,13 @@ static void test_CreateBitmapFromHBITMAP(void) ok(hbmp != 0, "failed to create bitmap\n"); hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapIgnoreAlpha, &bitmap); -todo_wine ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected WINCODEC_ERR_WIN32ERROR, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapIgnoreAlpha, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapIgnoreAlpha, &bitmap); -todo_wine ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); - if (hr != S_OK) return; IWICBitmap_GetPixelFormat(bitmap, &format); ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), @@ -770,6 +766,7 @@ todo_wine ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format); +todo_wine ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format %s\n", debugstr_guid(&format)); @@ -789,6 +786,7 @@ todo_wine hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); +todo_wine ok(count == 16, "expected 16, got %u\n", count); IWICPalette_Release(palette); @@ -837,7 +835,13 @@ todo_wine hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); + { + if (data[i] != data_8bpp_pal_wic[i]) +todo_wine + ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); + else + ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); + } IWICBitmap_Release(bitmap); DeleteObject(hbmp);

1 0

Stefan Dösinger : d3d9/tests: Test invalid volume lock boxes.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 2f9d9b503266d1a8f9f65ef37b1243947d0efb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9d9b503266d1a8f9f65ef37… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 18 12:24:59 2013 +0200 d3d9/tests: Test invalid volume lock boxes. --- dlls/d3d9/tests/device.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5e09e32..f71f8be 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7299,6 +7299,126 @@ static void test_volume_blocks(void) DestroyWindow(window); } +static void test_lockbox_invalid(void) +{ + static const struct + { + D3DBOX box; + HRESULT result; + } + test_data[] = + { + {{0, 0, 2, 2, 0, 1}, D3D_OK}, /* Valid */ + {{0, 0, 4, 4, 0, 1}, D3D_OK}, /* Valid */ + {{0, 0, 0, 4, 0, 1}, D3DERR_INVALIDCALL}, /* 0 height */ + {{0, 0, 4, 0, 0, 1}, D3DERR_INVALIDCALL}, /* 0 width */ + {{0, 0, 4, 4, 1, 1}, D3DERR_INVALIDCALL}, /* 0 depth */ + {{4, 0, 0, 4, 0, 1}, D3DERR_INVALIDCALL}, /* left > right */ + {{0, 4, 4, 0, 0, 1}, D3DERR_INVALIDCALL}, /* top > bottom */ + {{0, 0, 4, 4, 1, 0}, D3DERR_INVALIDCALL}, /* back > front */ + {{0, 0, 8, 4, 0, 1}, D3DERR_INVALIDCALL}, /* right > surface */ + {{0, 0, 4, 8, 0, 1}, D3DERR_INVALIDCALL}, /* bottom > surface */ + {{0, 0, 4, 4, 0, 3}, D3DERR_INVALIDCALL}, /* back > surface */ + {{8, 0, 16, 4, 0, 1}, D3DERR_INVALIDCALL}, /* left > surface */ + {{0, 8, 4, 16, 0, 1}, D3DERR_INVALIDCALL}, /* top > surface */ + {{0, 0, 4, 4, 2, 4}, D3DERR_INVALIDCALL}, /* top > surface */ + }; + static const D3DBOX test_boxt_2 = {2, 2, 4, 4, 0, 1}; + IDirect3DVolumeTexture9 *texture = NULL; + D3DLOCKED_BOX locked_box; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + BYTE *base; + HRESULT hr; + + if (!(d3d = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create D3D object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 2, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + base = locked_box.pBits; + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + { + unsigned int offset, expected_offset; + const D3DBOX *box = &test_data[i].box; + + locked_box.pBits = (BYTE *)0xdeadbeef; + locked_box.RowPitch = 0xdeadbeef; + locked_box.SlicePitch = 0xdeadbeef; + + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, box, 0); + /* Unlike surfaces, volumes properly check the box even in Windows XP */ + ok(hr == test_data[i].result, + "Got unexpected hr %#x with box [%u, %u, %u]->[%u, %u, %u], expected %#x.\n", + hr, box->Left, box->Top, box->Front, box->Right, box->Bottom, box->Back, + test_data[i].result); + if (FAILED(hr)) + continue; + + offset = (BYTE *)locked_box.pBits - base; + expected_offset = box->Front * locked_box.SlicePitch + box->Top * locked_box.RowPitch + box->Left * 4; + ok(offset == expected_offset, + "Got unexpected offset %u (expected %u) for rect [%u, %u, %u]->[%u, %u, %u].\n", + offset, expected_offset, box->Left, box->Top, box->Front, box->Right, box->Bottom, box->Back); + + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + } + + /* locked_box = NULL throws an exception on Windows */ + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, &test_data[0].box, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%u, %u, %u]->[%u, %u, %u].\n", + hr, test_data[0].box.Left, test_data[0].box.Top, test_data[0].box.Front, + test_data[0].box.Right, test_data[0].box.Bottom, test_data[0].box.Back); + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, &test_data[0].box, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for rect [%u, %u, %u]->[%u, %u, %u].\n", + hr, test_data[0].box.Left, test_data[0].box.Top, test_data[0].box.Front, + test_data[0].box.Right, test_data[0].box.Bottom, test_data[0].box.Back); + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &locked_box, &test_boxt_2, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for rect [%u, %u, %u]->[%u, %u, %u].\n", + hr, test_boxt_2.Left, test_boxt_2.Top, test_boxt_2.Front, + test_boxt_2.Right, test_boxt_2.Bottom, test_boxt_2.Back); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -7393,6 +7513,7 @@ START_TEST(device) test_update_volumetexture(); test_create_rt_ds_fail(); test_volume_blocks(); + test_lockbox_invalid(); } out:

1 0

Stefan Dösinger : wined3d: Implement locking of block-based volume textures.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: ac37f7a2ac09c77f7bd9db39c3180307696fdc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac37f7a2ac09c77f7bd9db39c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 18 12:24:56 2013 +0200 wined3d: Implement locking of block-based volume textures. --- dlls/wined3d/volume.c | 95 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 88 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 508b1df..fcab45b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -71,6 +71,31 @@ static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, checkGLcall("glTexImage3D"); } +static void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, + UINT *slice_pitch) +{ + const struct wined3d_format *format = volume->resource.format; + + if (format->flags & WINED3DFMT_FLAG_BLOCKS) + { + /* Since compressed formats are block based, pitch means the amount of + * bytes to the next row of block rather than the next row of pixels. */ + UINT row_block_count = (volume->resource.width + format->block_width - 1) / format->block_width; + UINT slice_block_count = (volume->resource.height + format->block_height - 1) / format->block_height; + *row_pitch = row_block_count * format->block_byte_count; + *slice_pitch = *row_pitch * slice_block_count; + } + else + { + unsigned char alignment = volume->resource.device->surface_alignment; + *row_pitch = format->byte_count * volume->resource.width; /* Bytes / row */ + *row_pitch = (*row_pitch + alignment - 1) & ~(alignment - 1); + *slice_pitch = *row_pitch * volume->resource.height; + } + + TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch); +} + /* Context activation is done by the caller. */ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) @@ -513,6 +538,34 @@ struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volum return &volume->resource; } +static BOOL volume_check_block_align(const struct wined3d_volume *volume, + const struct wined3d_box *box) +{ + UINT width_mask, height_mask; + const struct wined3d_format *format = volume->resource.format; + + if (!box) + return TRUE; + + /* This assumes power of two block sizes, but NPOT block sizes would be + * silly anyway. + * + * This also assumes that the format's block depth is 1. */ + width_mask = format->block_width - 1; + height_mask = format->block_height - 1; + + if (box->left & width_mask) + return FALSE; + if (box->top & height_mask) + return FALSE; + if (box->right & width_mask && box->right != volume->resource.width) + return FALSE; + if (box->bottom & height_mask && box->bottom != volume->resource.height) + return FALSE; + + return TRUE; +} + HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { @@ -520,6 +573,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_context *context; const struct wined3d_gl_info *gl_info; BYTE *base_memory; + const struct wined3d_format *format = volume->resource.format; TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); @@ -535,6 +589,13 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, WARN("Volume is already mapped.\n"); return WINED3DERR_INVALIDCALL; } + if ((format->flags & WINED3DFMT_FLAG_BLOCKS) && !volume_check_block_align(volume, box)) + { + WARN("Map box is misaligned for %ux%u blocks.\n", + format->block_width, format->block_height); + return WINED3DERR_INVALIDCALL; + } + flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); if (volume->flags & WINED3D_VFLAG_PBO) @@ -591,9 +652,16 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, TRACE("Base memory pointer %p.\n", base_memory); - map_desc->row_pitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ - map_desc->slice_pitch = volume->resource.format->byte_count - * volume->resource.width * volume->resource.height; /* Bytes / slice */ + if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { + map_desc->row_pitch = volume->resource.width * format->byte_count; + map_desc->slice_pitch = map_desc->row_pitch * volume->resource.height; + } + else + { + wined3d_volume_get_pitch(volume, &map_desc->row_pitch, &map_desc->slice_pitch); + } + if (!box) { TRACE("No box supplied - all is ok\n"); @@ -603,10 +671,23 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, { TRACE("Lock Box (%p) = l %u, t %u, r %u, b %u, fr %u, ba %u\n", box, box->left, box->top, box->right, box->bottom, box->front, box->back); - map_desc->data = base_memory - + (map_desc->slice_pitch * box->front) /* FIXME: is front < back or vica versa? */ - + (map_desc->row_pitch * box->top) - + (box->left * volume->resource.format->byte_count); + + if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) + { + /* Compressed textures are block based, so calculate the offset of + * the block that contains the top-left pixel of the locked rectangle. */ + map_desc->data = base_memory + + (box->front * map_desc->slice_pitch) + + ((box->top / format->block_height) * map_desc->row_pitch) + + ((box->left / format->block_width) * format->block_byte_count); + } + else + { + map_desc->data = base_memory + + (map_desc->slice_pitch * box->front) + + (map_desc->row_pitch * box->top) + + (box->left * volume->resource.format->byte_count); + } } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY)))

1 0

Alistair Leslie-Hughes : dbs.idl: Add type DB_NUMERIC.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 16f99ce6623d404b20b55f8b73ae40a1fae81d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f99ce6623d404b20b55f8b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 16 11:38:16 2013 +1000 dbs.idl: Add type DB_NUMERIC. --- include/dbs.idl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index ceb9773..1e0ac6c 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -50,6 +50,13 @@ typedef struct tagDBID { } uName; } DBID; +typedef struct tagDB_NUMERIC { + BYTE precision; + BYTE scale; + BYTE sign; + BYTE val[16]; +} DB_NUMERIC; + typedef DWORD DBPROPID; typedef struct tagDBPROPIDSET {

1 0

Andrew Eikum : oleaut32: Implement VarDecRound.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 87c459ab2359784f238c30073b1adc0111876987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c459ab2359784f238c30073… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 17 13:01:45 2013 -0500 oleaut32: Implement VarDecRound. --- dlls/oleaut32/tests/vartype.c | 35 +++++++++++++++++ dlls/oleaut32/vartype.c | 86 ++++++++++++++++++++++++++++++----------- 2 files changed, 98 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4c823c6..e296e77 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -455,6 +455,7 @@ static HRESULT (WINAPI *pVarDecDiv)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecCmp)(const DECIMAL*,const DECIMAL*); static HRESULT (WINAPI *pVarDecCmpR8)(const DECIMAL*,double); static HRESULT (WINAPI *pVarDecNeg)(const DECIMAL*,DECIMAL*); +static HRESULT (WINAPI *pVarDecRound)(const DECIMAL*,int,DECIMAL*); static HRESULT (WINAPI *pVarBoolFromUI1)(BYTE,VARIANT_BOOL*); static HRESULT (WINAPI *pVarBoolFromI2)(SHORT,VARIANT_BOOL*); @@ -4545,6 +4546,39 @@ static void test_VarDecCmpR8(void) SETDEC(l,0,DECIMAL_NEG,-1,-1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; } +#define CLEAR(x) memset(&(x), 0xBB, sizeof(x)) + +static void test_VarDecRound(void) +{ + HRESULT hres; + DECIMAL l, out; + + CHECKPTR(VarDecRound); + + CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = pVarDecRound(&l, 3, &out); EXPECTDEC(0, 0, 0, 1); + + CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 1); + CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 0); + CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); + CLEAR(out); SETDEC(l, 2, 0, 0, 11); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); + CLEAR(out); SETDEC(l, 2, 0, 0, 15); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 2); + CLEAR(out); SETDEC(l, 6, 0, 0, 550001); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 6); + + CLEAR(out); SETDEC(l, 0, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 0); + CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 11); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 15); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 2); + CLEAR(out); SETDEC(l, 6, DECIMAL_NEG, 0, 550001); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 6); + + CLEAR(out); SETDEC64(l, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0xffffffff, 0xffffffff, 0xffffffff); + CLEAR(out); SETDEC64(l, 28, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0, 0, 8); + CLEAR(out); SETDEC64(l, 0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); + CLEAR(out); SETDEC64(l, 28, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0, 0, 8); + + CLEAR(out); SETDEC(l, 2, 0, 0, 0); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 0); +} + /* * VT_BOOL */ @@ -6334,6 +6368,7 @@ START_TEST(vartype) test_VarDecCmpR8(); test_VarDecMul(); test_VarDecDiv(); + test_VarDecRound(); test_VarBoolFromI1(); test_VarBoolFromUI1(); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 74f66de..e1672a1 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5137,7 +5137,7 @@ static int VARIANT_int_addlossy( in case of quotient overflow. */ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * divisor, - VARIANT_DI * quotient) + VARIANT_DI * quotient, BOOL round_remainder) { HRESULT r_overflow = S_OK; @@ -5180,8 +5180,21 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di underflow = VARIANT_int_addlossy( quotient->bitsnum, &quotientscale, sizeof(quotient->bitsnum) / sizeof(DWORD), remainderplusquotient, &tempquotientscale, 4); - VARIANT_int_mulbychar(remainderplusquotient + 4, 4, 10); - memcpy(remainderplusquotient, remainderplusquotient + 4, 4 * sizeof(DWORD)); + if (round_remainder) { + if(remainderplusquotient[4] >= 5){ + unsigned int i; + unsigned char remainder = 1; + for (i = 0; i < sizeof(quotient->bitsnum) / sizeof(DWORD) && remainder; i++) { + ULONGLONG digit = quotient->bitsnum[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + quotient->bitsnum[i] = digit & 0xFFFFFFFF; + } + } + memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); + } else { + VARIANT_int_mulbychar(remainderplusquotient + 4, 4, 10); + memcpy(remainderplusquotient, remainderplusquotient + 4, 4 * sizeof(DWORD)); + } tempquotientscale = ++remainderscale; } while (!underflow && !VARIANT_int_iszero(remainderplusquotient + 4, 4)); @@ -5485,31 +5498,16 @@ static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest) return hres; } -/************************************************************************ - * VarDecDiv (OLEAUT32.178) - * - * Divide one DECIMAL by another. - * - * PARAMS - * pDecLeft [I] Source - * pDecRight [I] Value to divide by - * pDecOut [O] Destination - * - * RETURNS - * Success: S_OK. - * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination - */ -HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) +static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecRight, DECIMAL *pDecOut, + BOOL round) { HRESULT hRet = S_OK; VARIANT_DI di_left, di_right, di_result; HRESULT divresult; - if (!pDecLeft || !pDecRight || !pDecOut) return E_INVALIDARG; - VARIANT_DIFromDec(pDecLeft, &di_left); VARIANT_DIFromDec(pDecRight, &di_right); - divresult = VARIANT_DI_div(&di_left, &di_right, &di_result); + divresult = VARIANT_DI_div(&di_left, &di_right, &di_result, round); if (divresult != S_OK) { /* division actually overflowed */ @@ -5557,6 +5555,27 @@ HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI } /************************************************************************ + * VarDecDiv (OLEAUT32.178) + * + * Divide one DECIMAL by another. + * + * PARAMS + * pDecLeft [I] Source + * pDecRight [I] Value to divide by + * pDecOut [O] Destination + * + * RETURNS + * Success: S_OK. + * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination + */ +HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) +{ + if (!pDecLeft || !pDecRight || !pDecOut) return E_INVALIDARG; + + return VARIANT_do_division(pDecLeft, pDecRight, pDecOut, FALSE); +} + +/************************************************************************ * VarDecMul (OLEAUT32.179) * * Multiply one DECIMAL by another. @@ -5765,6 +5784,10 @@ HRESULT WINAPI VarDecNeg(const DECIMAL* pDecIn, DECIMAL* pDecOut) */ HRESULT WINAPI VarDecRound(const DECIMAL* pDecIn, int cDecimals, DECIMAL* pDecOut) { + DECIMAL divisor, tmp; + HRESULT hr; + unsigned int i; + if (cDecimals < 0 || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG) || DEC_SCALE(pDecIn) > DEC_MAX_SCALE) return E_INVALIDARG; @@ -5774,9 +5797,26 @@ HRESULT WINAPI VarDecRound(const DECIMAL* pDecIn, int cDecimals, DECIMAL* pDecOu return S_OK; } - FIXME("semi-stub!\n"); + /* truncate significant digits and rescale */ + memset(&divisor, 0, sizeof(divisor)); + DEC_LO64(&divisor) = 1; - return DISP_E_OVERFLOW; + memset(&tmp, 0, sizeof(tmp)); + DEC_LO64(&tmp) = 10; + for (i = 0; i < DEC_SCALE(pDecIn) - cDecimals; ++i) + { + hr = VarDecMul(&divisor, &tmp, &divisor); + if (FAILED(hr)) + return hr; + } + + hr = VARIANT_do_division(pDecIn, &divisor, pDecOut, TRUE); + if (FAILED(hr)) + return hr; + + DEC_SCALE(pDecOut) = cDecimals; + + return S_OK; } /************************************************************************

1 0