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

Rico Schüller : d3dx9: Use param-> bytes for copying the data in ID3DXBaseEffect::SetValue().
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: fcb5b6c32cd40e8a6383a091a94f124cd7b360a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb5b6c32cd40e8a6383a091a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 18 09:33:35 2012 +0200 d3dx9: Use param->bytes for copying the data in ID3DXBaseEffect::SetValue(). --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b8509b1..def73a0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1623,7 +1623,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH return E_FAIL; } - if (data && param->bytes >= bytes) + if (data && param->bytes <= bytes) { switch (param->type) { @@ -1631,8 +1631,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH case D3DXPT_BOOL: case D3DXPT_INT: case D3DXPT_FLOAT: - TRACE("Copy %u bytes\n", bytes); - memcpy(param->data, data, bytes); + TRACE("Copy %u bytes\n", param->bytes); + memcpy(param->data, data, param->bytes); break; default: @@ -3580,7 +3580,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX TRACE("iface %p, manager %p\n", This, manager); if (manager) IUnknown_AddRef(manager); - if (This->manager) IUnknown_Release(This->manager); + if (This->manager) IUnknown_Release(This->manager); This->manager = manager;

1 0

André Hentschel : netapi32: Remove unneeded shadow variables.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: 7aa160a98eb908a3168f548d5748100ecf7ba1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa160a98eb908a3168f548d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:33 2012 +0200 netapi32: Remove unneeded shadow variables. --- dlls/netapi32/access.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 6750a11..09b5b63 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -294,7 +294,6 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, { PUSER_INFO_10 ui; PUSER_INFO_0 ui0; - NET_API_STATUS status; /* sizes of the field buffers in WCHARS */ int name_sz, comment_sz, usr_comment_sz, full_name_sz; @@ -339,7 +338,6 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, static const WCHAR homedirW[] = {'H','O','M','E',0}; PUSER_INFO_1 ui; PUSER_INFO_0 ui0; - NET_API_STATUS status; /* sizes of the field buffers in WCHARS */ int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz;

1 0

André Hentschel : gdi32: Remove unneeded shadow variable.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: 9cf97e18b437a6e349409edeecbac8004edfc07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf97e18b437a6e349409edee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:15 2012 +0200 gdi32: Remove unneeded shadow variable. --- dlls/gdi32/bidi.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 9b8f758..0354996 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -592,7 +592,6 @@ BOOL BIDI_Reorder( if (lpGlyphs && doGlyphs) { - int j; BYTE runOrder[maxItems]; int visOrder[maxItems]; SCRIPT_ITEM *curItem;

1 0

André Hentschel : devenum: Remove unneeded shadow variables.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: 8ef61a98f061942c4f9fff33edb27c22013c05ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef61a98f061942c4f9fff33e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:08 2012 +0200 devenum: Remove unneeded shadow variables. --- dlls/devenum/createdevenum.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index fad1325..f4e8727 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -171,10 +171,10 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) for (i1 = 0; i1 < dwMinorTypes; i1++) { WCHAR wszMinorTypeName[64]; - DWORD cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; + cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -349,7 +349,6 @@ static HRESULT DEVENUM_RegisterLegacyAmFilters(void) HKEY hkeyCategoryBaseKey; WCHAR wszRegKey[MAX_PATH]; HKEY hkeyInstance = NULL; - HRESULT hr; if (RegEnumKeyExW(hkeyFilter, i, wszFilterSubkeyName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;

1 0

Vincent Povirk : gdiplus: Add support for JPEG encoding.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: 57e491210819ec068f1ad8a0daadaf08e5095cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e491210819ec068f1ad8a0d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 17:25:01 2012 -0500 gdiplus: Add support for JPEG encoding. --- dlls/gdiplus/image.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3b70b25..825ca02 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3103,6 +3103,12 @@ static GpStatus encode_image_png(GpImage *image, IStream* stream, return encode_image_WIC(image, stream, &CLSID_WICPngEncoder, params); } +static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_WIC(image, stream, &CLSID_WICJpegEncoder, params); +} + /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] */ @@ -3277,14 +3283,14 @@ static const struct image_codec codecs[NUM_CODECS] = { /* FormatDescription */ jpeg_format, /* FilenameExtension */ jpeg_extension, /* MimeType */ jpeg_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsEncoder | ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 1, /* SigSize */ 2, /* SigPattern */ jpeg_sig_pattern, /* SigMask */ jpeg_sig_mask, }, - NULL, + encode_image_jpeg, decode_image_jpeg }, {

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_WriteSource.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: 8b3fce9b8ea2c995794cae985252785acdfb01d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3fce9b8ea2c995794cae985… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:01:58 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_WriteSource. --- dlls/windowscodecs/jpegformat.c | 70 +++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 3a9b095..d15dabf 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1064,8 +1064,74 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + WICRect rc; + WICPixelFormatGUID guid; + UINT stride; + BYTE *pixeldata; + TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); + + if (!This->frame_initialized || !This->width || !This->height) + return WINCODEC_ERR_WRONGSTATE; + + if (!This->format) + { + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); + if (FAILED(hr)) return hr; + } + + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&guid)); + return E_FAIL; + } + + if (This->xres == 0.0 || This->yres == 0.0) + { + double xres, yres; + hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + + if (prc->Width != This->width) return E_INVALIDARG; + + stride = (This->format->bpp * This->width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return hr; } static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface)

1 0

André Hentschel : winhlp32: Remove unneeded shadow variables.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: d1a5ce537d42a0ea666cfe063f31f9ebd221b7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a5ce537d42a0ea666cfe063… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:12:07 2012 +0200 winhlp32: Remove unneeded shadow variables. --- programs/winhlp32/hlpfile.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 5f54bd3..b34c42f 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1527,7 +1527,6 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0x88: { BYTE type = format[1]; - LONG size; /* FIXME: we don't use 'BYTE pos = (*format - 0x86);' for the image position */ format += 2; @@ -2078,9 +2077,9 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) if (hlpfile->windows) { - unsigned flags = GET_USHORT(ptr, 4); HLPFILE_WINDOWINFO* wi = &hlpfile->windows[hlpfile->numWindows - 1]; + flags = GET_USHORT(ptr, 4); if (flags & 0x0001) strcpy(wi->type, &str[2]); else wi->type[0] = '\0'; if (flags & 0x0002) strcpy(wi->name, &str[12]);

1 0

André Hentschel : mscms: Remove unneeded shadow variable.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: f796f967e2897c528304fe9efe869b391ba7f84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f796f967e2897c528304fe9ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:28 2012 +0200 mscms: Remove unneeded shadow variable. --- dlls/mscms/profile.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 54e4afd..b0ffce4 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1473,7 +1473,6 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); else { - DWORD size; WCHAR *path; if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA)

1 0

Jacek Caban : mshtml: Copy filter value in HTMLElement_clone.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: d66dacce6847cd80091cd87038d3fde30eeb5cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66dacce6847cd80091cd8703… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 15:26:12 2012 +0200 mshtml: Copy filter value in HTMLElement_clone. --- dlls/mshtml/htmlelem.c | 10 +++++++++- dlls/mshtml/tests/jstest.html | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 02a49d2..9184b9b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -269,7 +269,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr DISPPARAMS dispParams; EXCEPINFO excep; - TRACE("(%p)->(%s . %08x)\n", This, debugstr_w(strAttributeName), lFlags); + TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, fdexNameCaseInsensitive | fdexNameEnsure, &dispid); @@ -1627,6 +1627,14 @@ HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode ** if(FAILED(hres)) return hres; + if(This->filter) { + new_elem->filter = heap_strdupW(This->filter); + if(!new_elem->filter) { + IHTMLElement_Release(&This->IHTMLElement_iface); + return E_OUTOFMEMORY; + } + } + IHTMLElement_AddRef(&new_elem->IHTMLElement_iface); *ret = &new_elem->node; return S_OK; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 10863f4..e61ee85 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -80,6 +80,17 @@ function test_remove_style_attribute() { ok(b === false, "removeAttribute returned " + b + " expected false"); } +function test_clone_node() { + var elem, cloned; + + elem = document.getElementById("divid"); + elem.style.filter = "alpha(opacity=50)"; + ok(elem.style.filter === "alpha(opacity=50)", "elem.style.filter = " + elem.style.filter); + + cloned = elem.cloneNode(true); + ok(cloned.style.filter === "alpha(opacity=50)", "cloned.style.filter = " + cloned.style.filter); +} + var globalVar = false; function runTest() { @@ -91,6 +102,7 @@ function runTest() { test_removeAttribute(document.getElementById("divid")); test_removeAttribute(document.body); test_select_index(); + test_clone_node(); test_createDocumentFragment(); test_document_name_as_index(); test_remove_style_attribute();

1 0

Jacek Caban : mshtml: Allow more tests to be ran in non-administrator mode.
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: 120962b30e397fad64f94e51cfa6e3b9a4d12ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120962b30e397fad64f94e51c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 15:26:03 2012 +0200 mshtml: Allow more tests to be ran in non-administrator mode. --- dlls/mshtml/tests/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index df391d6..0457029 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2791,11 +2791,11 @@ START_TEST(script) if(winetest_interactive || ! is_ie_hardened()) { if(register_script_engine()) { test_simple_script(); - run_js_tests(); init_registry(FALSE); }else { skip("Could not register TestScript engine\n"); } + run_js_tests(); }else { skip("IE running in Enhanced Security Configuration\n"); }

1 0