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

Nikolay Sivov : msxml3: Implement put_nodeTypedValue() for bin. base64 type and commonly used input vartypes.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: a11ce7945ade91ad2681febd794f072a3691597d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11ce7945ade91ad2681febd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 29 11:10:55 2012 +0400 msxml3: Implement put_nodeTypedValue() for bin.base64 type and commonly used input vartypes. --- dlls/msxml3/element.c | 114 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 94 ++++++++++++++++++++++++++++++++++++- 2 files changed, 202 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 26bfd0c..db6b283 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -732,6 +732,75 @@ static HRESULT WINAPI domelem_get_nodeTypedValue( return hr; } +static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) +{ + static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + const BYTE *d = buf; + int bytes, pad_bytes, div, i; + DWORD needed; + WCHAR *ptr; + + bytes = (len*8 + 5)/6; + pad_bytes = (bytes % 4) ? 4 - (bytes % 4) : 0; + + TRACE("%d, bytes is %d, pad bytes is %d\n", len, bytes, pad_bytes); + needed = bytes + pad_bytes + 1; + + *ret = SysAllocStringLen(NULL, needed); + if (!*ret) return E_OUTOFMEMORY; + + /* Three bytes of input give 4 chars of output */ + div = len / 3; + + ptr = *ret; + i = 0; + while (div > 0) + { + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte and the first 4 + * bits of the second byte */ + *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + /* third char is the last 4 bits of the second byte and the first 2 + * bits of the third byte */ + *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; + /* fourth char is the remaining 6 bits of the third byte */ + *ptr++ = b64[ d[2] & 0x3f]; + i += 4; + d += 3; + div--; + } + + switch (pad_bytes) + { + case 1: + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte and the first 4 + * bits of the second byte */ + *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + /* third char is the last 4 bits of the second byte padded with + * two zeroes */ + *ptr++ = b64[ ((d[1] << 2) & 0x3c) ]; + /* fourth char is a = to indicate one byte of padding */ + *ptr++ = '='; + break; + case 2: + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte padded with + * four zeroes*/ + *ptr++ = b64[ ((d[0] << 4) & 0x30)]; + /* third char is = to indicate padding */ + *ptr++ = '='; + /* fourth char is = to indicate padding */ + *ptr++ = '='; + break; + } + + return S_OK; +} + static HRESULT WINAPI domelem_put_nodeTypedValue( IXMLDOMElement *iface, VARIANT value) @@ -743,9 +812,10 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); dt = element_get_dt(get_element(This)); - /* for untyped node coerce to BSTR and set */ - if (dt == DT_INVALID) + switch (dt) { + /* for untyped node coerce to BSTR and set */ + case DT_INVALID: if (V_VT(&value) != VT_BSTR) { VARIANT content; @@ -759,9 +829,43 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( } else hr = node_set_content(&This->node, V_BSTR(&value)); - } - else - { + break; + case DT_BIN_BASE64: + if (V_VT(&value) == VT_BSTR) + hr = node_set_content(&This->node, V_BSTR(&value)); + else if (V_VT(&value) == (VT_UI1|VT_ARRAY)) + { + UINT dim = SafeArrayGetDim(V_ARRAY(&value)); + LONG lbound, ubound; + BSTR encoded; + BYTE *ptr; + int len; + + if (dim > 1) + FIXME("unexpected array dimension count %u\n", dim); + + SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + + len = (ubound - lbound + 1)*SafeArrayGetElemsize(V_ARRAY(&value)); + + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + if (FAILED(hr)) return hr; + + hr = encode_base64(ptr, len, &encoded); + SafeArrayUnaccessData(V_ARRAY(&value)); + if (FAILED(hr)) return hr; + + hr = node_set_content(&This->node, encoded); + SysFreeString(encoded); + } + else + { + FIXME("unhandled variant type %d for dt:%s\n", V_VT(&value), debugstr_dt(dt)); + return E_NOTIMPL; + } + break; + default: FIXME("not implemented for dt:%s\n", debugstr_dt(dt)); return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4bbbe56..7a02e19 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9076,8 +9076,13 @@ static void test_put_nodeTypedValue(void) { IXMLDOMDocument *doc; IXMLDOMElement *elem; - VARIANT type; + VARIANT type, value; + LONG ubound, lbound; + IXMLDOMNode *node; + SAFEARRAY *array; HRESULT hr; + BYTE *ptr; + BSTR str; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -9110,6 +9115,93 @@ static void test_put_nodeTypedValue(void) "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); VariantClear(&type); + hr = IXMLDOMElement_get_firstChild(elem, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMElement_removeChild(elem, node, NULL); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)elem, NULL); + EXPECT_HR(hr, S_OK); + + /* bin.base64 */ + hr = IXMLDOMElement_put_dataType(elem, _bstr_("bin.base64")); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_BSTR; + V_BSTR(&value) = _bstr_("ABCD"); + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value)); + ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n"); + ubound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + EXPECT_HR(hr, S_OK); + ok(ubound == 2, "got %d\n", ubound); + lbound = 0; + hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + EXPECT_HR(hr, S_OK); + ok(lbound == 0, "got %d\n", lbound); + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + EXPECT_HR(hr, S_OK); + ok(ptr[0] == 0, "got %x\n", ptr[0]); + ok(ptr[1] == 0x10, "got %x\n", ptr[1]); + ok(ptr[2] == 0x83, "got %x\n", ptr[2]); + SafeArrayUnaccessData(V_ARRAY(&value)); + VariantClear(&value); + + /* when set as VT_BSTR it's stored as is */ + hr = IXMLDOMElement_get_firstChild(elem, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str)); + IXMLDOMNode_Release(node); + + array = SafeArrayCreateVector(VT_UI1, 0, 7); + hr = SafeArrayAccessData(array, (void*)&ptr); + EXPECT_HR(hr, S_OK); + memcpy(ptr, "dGVzdA=", strlen("dGVzdA=")); + SafeArrayUnaccessData(V_ARRAY(&value)); + + V_VT(&value) = VT_UI1|VT_ARRAY; + V_ARRAY(&value) = array; + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value)); + ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n"); + ubound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + EXPECT_HR(hr, S_OK); + ok(ubound == 6, "got %d\n", ubound); + lbound = 0; + hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + EXPECT_HR(hr, S_OK); + ok(lbound == 0, "got %d\n", lbound); + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + EXPECT_HR(hr, S_OK); + ok(!memcmp(ptr, "dGVzdA=", strlen("dGVzdA=")), "got wrong data, %s\n", ptr); + SafeArrayUnaccessData(V_ARRAY(&value)); + VariantClear(&value); + + /* if set with VT_UI1|VT_ARRAY it's encoded */ + hr = IXMLDOMElement_get_firstChild(elem, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); + IXMLDOMNode_Release(node); + + SafeArrayDestroyData(array); + IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Henri Verbeet : d3d9: Implement d3d9_device_PresentEx().
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 256d43316418a346978834a41b52c4f99456bb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=256d43316418a346978834a41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 29 07:37:56 2012 +0200 d3d9: Implement d3d9_device_PresentEx(). --- dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 20 +++++++++++++++----- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 3 +++ include/wine/wined3d.h | 2 +- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 62a8e70..d5fd32a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -610,7 +610,8 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); wined3d_mutex_lock(); - hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region); + hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, + dst_window_override, dirty_region, 0); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4256fc..bcad6aa 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -584,11 +584,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * iface, src_rect, dst_rect, dst_window_override, dirty_region); wined3d_mutex_lock(); - hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region); + hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, + dst_window_override, dirty_region, 0); wined3d_mutex_unlock(); return hr; - } +} static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT swapchain, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) @@ -2818,10 +2819,19 @@ static HRESULT WINAPI d3d9_device_PresentEx(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { - FIXME("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x stub!\n", - iface, src_rect, dst_rect, dst_window_override, dirty_region, flags); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", + iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), + dst_window_override, dirty_region, flags); + + wined3d_mutex_lock(); + hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, + dst_window_override, dirty_region, flags); + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI d3d9_device_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8c01184..9b73f01 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3821,18 +3821,18 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) } HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, - const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) + const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { UINT i; - TRACE("device %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", + TRACE("device %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", device, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), - dst_window_override, dirty_region); + dst_window_override, dirty_region, flags); for (i = 0; i < device->swapchain_count; ++i) { wined3d_swapchain_present(device->swapchains[i], src_rect, - dst_rect, dst_window_override, dirty_region, 0); + dst_rect, dst_window_override, dirty_region, flags); } return WINED3D_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6dbd2d7..8c69fad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -150,6 +150,9 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5d4111d..5e95917 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2181,7 +2181,7 @@ HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wi HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, - const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region); + const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf);

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetPropertyItemSize.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 9d953c5f793174d28f20df6c5a378ea09f01aeaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d953c5f793174d28f20df6c5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:25:57 2012 +0900 gdiplus: Implement GdipGetPropertyItemSize. --- dlls/gdiplus/image.c | 67 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e676a4e..63f3a65 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2488,20 +2488,69 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size, return InvalidParameter; } -GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID pid, - UINT* size) +static UINT propvariant_size(PROPVARIANT *value) { - static int calls; + switch (value->vt & ~VT_VECTOR) + { + case VT_EMPTY: + return 0; + case VT_I1: + case VT_UI1: + if (!(value->vt & VT_VECTOR)) return 1; + return value->u.caub.cElems; + case VT_I2: + case VT_UI2: + if (!(value->vt & VT_VECTOR)) return 2; + return value->u.caui.cElems * 2; + case VT_I4: + case VT_UI4: + case VT_R4: + if (!(value->vt & VT_VECTOR)) return 4; + return value->u.caul.cElems * 4; + case VT_I8: + case VT_UI8: + case VT_R8: + if (!(value->vt & VT_VECTOR)) return 8; + return value->u.cauh.cElems * 8; + case VT_LPSTR: + return value->u.pszVal ? strlen(value->u.pszVal) + 1 : 0; + case VT_BLOB: + return value->u.blob.cbSize; + default: + FIXME("not supported variant type %d\n", value->vt); + return 0; + } +} - TRACE("%p %x %p\n", image, pid, size); +GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT *size) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT id, value; - if(!size || !image) - return InvalidParameter; + TRACE("(%p,%#x,%p)\n", image, propid, size); - if(!(calls++)) - FIXME("not implemented\n"); + if (!size || !image) return InvalidParameter; - return NotImplemented; + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) return PropertyNotFound; + + id.vt = VT_UI2; + id.u.uiVal = propid; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (FAILED(hr)) return PropertyNotFound; + + *size = propvariant_size(&value); + if (*size) *size += sizeof(PropertyItem); + PropVariantClear(&value); + + return Ok; } GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num)

1 0

Dmitry Timoshkov : include/basetsd.h: Fix int64 to int truncation warnings when compiling with a 64-bit PSDK compiler .
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 79969b6cc4bed59e7c24f03a001776b3816d9b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79969b6cc4bed59e7c24f03a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 19:12:31 2012 +0900 include/basetsd.h: Fix int64 to int truncation warnings when compiling with a 64-bit PSDK compiler. --- include/basetsd.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 698dd5c..4a59897 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -153,12 +153,12 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR; static inline ULONG32 HandleToULong(const void *h) { - return (ULONG_PTR)h; + return (ULONG32)(ULONG_PTR)h; } static inline LONG32 HandleToLong(const void *h) { - return (LONG_PTR)h; + return (LONG32)(LONG_PTR)h; } static inline void *ULongToHandle(ULONG32 ul) @@ -173,32 +173,32 @@ static inline void *LongToHandle(LONG32 l) static inline ULONG32 PtrToUlong(const void *p) { - return (ULONG_PTR)p; + return (ULONG32)(ULONG_PTR)p; } static inline LONG32 PtrToLong(const void *p) { - return (LONG_PTR)p; + return (LONG32)(LONG_PTR)p; } static inline UINT32 PtrToUint(const void *p) { - return (UINT_PTR)p; + return (UINT32)(UINT_PTR)p; } static inline INT32 PtrToInt(const void *p) { - return (INT_PTR)p; + return (INT32)(INT_PTR)p; } static inline UINT16 PtrToUshort(const void *p) { - return (ULONG_PTR)p; + return (UINT16)(ULONG_PTR)p; } static inline INT16 PtrToShort(const void *p) { - return (LONG_PTR)p; + return (INT16)(LONG_PTR)p; } static inline void *IntToPtr(INT32 i)

1 0

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_set_adapter_display_mode ().
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: d8434475809ff23ad823dad24a1c0a1a808b615b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8434475809ff23ad823dad24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 29 07:37:54 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_set_adapter_display_mode(). --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6212546..0da622a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3127,7 +3127,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, return WINED3D_OK; } - ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) { if (devmode.dmDisplayFrequency) @@ -3135,7 +3135,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate.\n"); devmode.dmFields &= ~DM_DISPLAYFREQUENCY; devmode.dmDisplayFrequency = 0; - ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); } if (ret != DISP_CHANGE_SUCCESSFUL) return WINED3DERR_NOTAVAILABLE;

1 0

Francois Gouget : po: Fix the Gecko link in the Dutch translation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 98a160c1afaad88237ea053b4ff2542edc632ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a160c1afaad88237ea053b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 29 08:31:35 2012 +0200 po: Fix the Gecko link in the Dutch translation. --- po/nl.po | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index 21cbf42..bbf42a9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -131,8 +131,9 @@ msgstr "" "gebruik maken van embedded HTML. Wine kan het automatisch voor u downloaden " "en installeren.\n" "\n" -"Noot: Het wordt aanbevolen om distributiepakketten te gebruiken. Zie <a " -"href=http://wiki.winehq.org/Gecko</a> voor details." +"Noot: Het wordt aanbevolen om distributiepakketten te gebruiken. Zie <a href=" +"\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> voor " +"details." #: appwiz.rc:106 appwiz.rc:121 msgid "&Install" @@ -186,8 +187,9 @@ msgstr "" "gebruik maken van embedded HTML. Wine kan het automatisch voor u downloaden " "en installeren.\n" "\n" -"Noot: Het wordt aanbevolen om distributiepakketten te gebruiken. Zie <a " -"href=http://wiki.winehq.org/Gecko voor details." +"Noot: Het wordt aanbevolen om distributiepakketten te gebruiken. Zie <a href=" +"\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> voor " +"details." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetPropertyItem.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 670445b22b9ce027bc35c40359499447ef4f8632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670445b22b9ce027bc35c4035… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:26:49 2012 +0900 gdiplus: Implement GdipGetPropertyItem. --- dlls/gdiplus/image.c | 144 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 131 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 63f3a65..d1affae 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2475,19 +2475,6 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list return hr == S_OK ? Ok : hresult_to_status(hr); } -GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size, - PropertyItem* buffer) -{ - static int calls; - - TRACE("(%p, %u, %u, %p)\n", image, id, size, buffer); - - if(!(calls++)) - FIXME("not implemented\n"); - - return InvalidParameter; -} - static UINT propvariant_size(PROPVARIANT *value) { switch (value->vt & ~VT_VECTOR) @@ -2553,6 +2540,137 @@ GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT return Ok; } +#ifndef PropertyTagTypeSByte +#define PropertyTagTypeSByte 6 +#define PropertyTagTypeSShort 8 +#define PropertyTagTypeFloat 11 +#define PropertyTagTypeDouble 12 +#endif + +static UINT vt_to_itemtype(UINT vt) +{ + static const struct + { + UINT vt, type; + } vt2type[] = + { + { VT_I1, PropertyTagTypeSByte }, + { VT_UI1, PropertyTagTypeByte }, + { VT_I2, PropertyTagTypeSShort }, + { VT_UI2, PropertyTagTypeShort }, + { VT_I4, PropertyTagTypeSLONG }, + { VT_UI4, PropertyTagTypeLong }, + { VT_I8, PropertyTagTypeSRational }, + { VT_UI8, PropertyTagTypeRational }, + { VT_R4, PropertyTagTypeFloat }, + { VT_R8, PropertyTagTypeDouble }, + { VT_LPSTR, PropertyTagTypeASCII }, + { VT_BLOB, PropertyTagTypeUndefined } + }; + UINT i; + for (i = 0; i < sizeof(vt2type)/sizeof(vt2type[0]); i++) + { + if (vt2type[i].vt == vt) return vt2type[i].type; + } + FIXME("not supported variant type %u\n", vt); + return 0; +} + +static GpStatus propvariant_to_item(PROPVARIANT *value, PropertyItem *item, + UINT size, PROPID id) +{ + UINT item_size, item_type; + + item_size = propvariant_size(value); + if (size != item_size + sizeof(PropertyItem)) return InvalidParameter; + + item_type = vt_to_itemtype(value->vt & ~VT_VECTOR); + if (!item_type) return InvalidParameter; + + item->value = item + 1; + + switch (value->vt & ~VT_VECTOR) + { + case VT_I1: + case VT_UI1: + if (!(value->vt & VT_VECTOR)) + *(BYTE *)item->value = value->u.bVal; + else + memcpy(item->value, value->u.caub.pElems, item_size); + break; + case VT_I2: + case VT_UI2: + if (!(value->vt & VT_VECTOR)) + *(USHORT *)item->value = value->u.uiVal; + else + memcpy(item->value, value->u.caui.pElems, item_size); + break; + case VT_I4: + case VT_UI4: + case VT_R4: + if (!(value->vt & VT_VECTOR)) + *(ULONG *)item->value = value->u.ulVal; + else + memcpy(item->value, value->u.caul.pElems, item_size); + break; + case VT_I8: + case VT_UI8: + case VT_R8: + if (!(value->vt & VT_VECTOR)) + *(ULONGLONG *)item->value = value->u.uhVal.QuadPart; + else + memcpy(item->value, value->u.cauh.pElems, item_size); + break; + case VT_LPSTR: + memcpy(item->value, value->u.pszVal, item_size); + break; + case VT_BLOB: + memcpy(item->value, value->u.blob.pBlobData, item_size); + break; + default: + FIXME("not supported variant type %d\n", value->vt); + return InvalidParameter; + } + + item->length = item_size; + item->type = item_type; + item->id = id; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID propid, UINT size, + PropertyItem *buffer) +{ + GpStatus stat; + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT id, value; + + TRACE("(%p,%#x,%u,%p)\n", image, propid, size, buffer); + + if (!image || !buffer) return InvalidParameter; + + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) return PropertyNotFound; + + id.vt = VT_UI2; + id.u.uiVal = propid; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (FAILED(hr)) return PropertyNotFound; + + stat = propvariant_to_item(&value, buffer, size, propid); + PropVariantClear(&value); + + return stat; +} + GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) { static int calls;

1 0

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_get_adapter_identifier ().
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 035b79ebcf6309752007c31eaa587717c88064e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035b79ebcf6309752007c31ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 29 07:37:55 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_get_adapter_identifier(). --- dlls/wined3d/directx.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0da622a..a9e41ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3186,17 +3186,12 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, /* Note that d3d8 doesn't supply a device name. */ if (identifier->device_name_size) { - static const char *device_name = "\\\\.\\DISPLAY1"; /* FIXME: May depend on desktop? */ - - len = strlen(device_name); - if (len >= identifier->device_name_size) + if (!WideCharToMultiByte(CP_ACP, 0, adapter->DeviceName, -1, identifier->device_name, + identifier->device_name_size, NULL, NULL)) { - ERR("Device name size too small.\n"); + ERR("Failed to convert device name, last error %#x.\n", GetLastError()); return WINED3DERR_INVALIDCALL; } - - memcpy(identifier->device_name, device_name, len); - identifier->device_name[len] = '\0'; } identifier->driver_version.u.HighPart = adapter->driver_info.version_high;

1 0

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_get_adapter_display_mode ().
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 56c518af3e9c31e1998164403262dc8ad073e0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c518af3e9c31e1998164403… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 29 07:37:53 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_get_adapter_display_mode(). --- dlls/wined3d/directx.c | 100 ++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0cff039..6212546 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3002,6 +3002,7 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { const struct wined3d_adapter *adapter; + DEVMODEW m; TRACE("wined3d %p, adapter_idx %u, display_mode %p, rotation %p.\n", wined3d, adapter_idx, mode, rotation); @@ -3011,67 +3012,58 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI adapter = &wined3d->adapters[adapter_idx]; - if (!adapter_idx) - { - DEVMODEW DevModeW; - - ZeroMemory(&DevModeW, sizeof(DevModeW)); - DevModeW.dmSize = sizeof(DevModeW); + memset(&m, 0, sizeof(m)); + m.dmSize = sizeof(m); - EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &DevModeW, 0); - mode->width = DevModeW.dmPelsWidth; - mode->height = DevModeW.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = DevModeW.dmDisplayFrequency; - mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); + EnumDisplaySettingsExW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &m, 0); + mode->width = m.dmPelsWidth; + mode->height = m.dmPelsHeight; + mode->refresh_rate = DEFAULT_REFRESH_RATE; + if (m.dmFields & DM_DISPLAYFREQUENCY) + mode->refresh_rate = m.dmDisplayFrequency; + mode->format_id = pixelformat_for_depth(m.dmBitsPerPel); - /* Lie about the format. X11 can't change the color depth, and some - * apps are pretty angry if they SetDisplayMode from 24 to 16 bpp and - * find out that GetDisplayMode still returns 24 bpp. This should - * probably be handled in winex11 instead. */ - if (adapter->screen_format && adapter->screen_format != mode->format_id) - { - WARN("Overriding format %s with stored format %s.\n", - debug_d3dformat(mode->format_id), - debug_d3dformat(adapter->screen_format)); - mode->format_id = adapter->screen_format; - } + /* Lie about the format. X11 can't change the color depth, and some apps + * are pretty angry if they SetDisplayMode from 24 to 16 bpp and find out + * that GetDisplayMode still returns 24 bpp. This should probably be + * handled in winex11 instead. */ + if (adapter->screen_format && adapter->screen_format != mode->format_id) + { + WARN("Overriding format %s with stored format %s.\n", + debug_d3dformat(mode->format_id), + debug_d3dformat(adapter->screen_format)); + mode->format_id = adapter->screen_format; + } - if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; + if (!(m.dmFields & DM_DISPLAYFLAGS)) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + else if (m.u2.dmDisplayFlags & DM_INTERLACED) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; + else + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; - if (rotation) + if (rotation) + { + switch (m.u1.s2.dmDisplayOrientation) { - switch (DevModeW.u1.s2.dmDisplayOrientation) - { - case DMDO_DEFAULT: - *rotation = WINED3D_DISPLAY_ROTATION_0; - break; - case DMDO_90: - *rotation = WINED3D_DISPLAY_ROTATION_90; - break; - case DMDO_180: - *rotation = WINED3D_DISPLAY_ROTATION_180; - break; - case DMDO_270: - *rotation = WINED3D_DISPLAY_ROTATION_270; - break; - default: - FIXME("Unhandled display rotation %#x.\n", DevModeW.u1.s2.dmDisplayOrientation); - *rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED; - break; - } + case DMDO_DEFAULT: + *rotation = WINED3D_DISPLAY_ROTATION_0; + break; + case DMDO_90: + *rotation = WINED3D_DISPLAY_ROTATION_90; + break; + case DMDO_180: + *rotation = WINED3D_DISPLAY_ROTATION_180; + break; + case DMDO_270: + *rotation = WINED3D_DISPLAY_ROTATION_270; + break; + default: + FIXME("Unhandled display rotation %#x.\n", m.u1.s2.dmDisplayOrientation); + *rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED; + break; } } - else - { - FIXME("Adapter not primary display.\n"); - } TRACE("Returning %ux%u@%u %s %#x.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id),

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapScaler::GetSize.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 6e790c9aec35f3b388bd566df5601833296af7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e790c9aec35f3b388bd566df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:21:24 2012 -0600 windowscodecs: Implement IWICBitmapScaler::GetSize. --- dlls/windowscodecs/scaler.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index be21dcc..f7ac48a 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -102,9 +102,19 @@ static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface) static HRESULT WINAPI BitmapScaler_GetSize(IWICBitmapScaler *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + if (!puiWidth || !puiHeight) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + *puiWidth = This->width; + *puiHeight = This->height; + + return S_OK; } static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface,

1 0