wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Nikolay Sivov : msxml3: Implement put_nodeTypedValue() for bin. base64 type and commonly used input vartypes.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Nikolay Sivov : msxml3: Support VT_UI1|VT_ARRAY variant debug output.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 17966321665c01f020fd0ceb8c9116c17a84618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17966321665c01f020fd0ceb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 29 00:44:50 2012 +0400 msxml3: Support VT_UI1|VT_ARRAY variant debug output. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 48d007f..1553e77 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -291,6 +291,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); case VT_VARIANT|VT_BYREF: return wine_dbg_sprintf("{VT_VARIANT|VT_BYREF: %s}", debugstr_variant(V_VARIANTREF(v))); + case VT_UI1|VT_ARRAY: + return "{VT_UI1|VT_ARRAY}"; default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Francois Gouget : msvcp60: Remove the msvcp90 debug channel from misc. c as it is unused.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: cdfaa90a8dfdd1981682c0e3a37c223f602c3169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfaa90a8dfdd1981682c0e3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 29 08:32:07 2012 +0200 msvcp60: Remove the msvcp90 debug channel from misc.c as it is unused. --- dlls/msvcp60/misc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 5390deb..4d51199 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -25,8 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); + /* ??0_Mutex@std@@QAE@XZ */ /* ??0_Mutex@std@@QEAA@XZ */

1 0

Francois Gouget : po: Fix the Gecko link in the Dutch translation.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Henri Verbeet : d3d9: Implement d3d9_GetAdapterModeCountEx().
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 8d4e3d0d5810d7a8b08cce4b0a6ac3e6ebb9d7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4e3d0d5810d7a8b08cce4b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 29 07:37:57 2012 +0200 d3d9: Implement d3d9_GetAdapterModeCountEx(). --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 18 +++++++++++++++--- dlls/dxgi/output.c | 3 ++- dlls/wined3d/directx.c | 19 ++++++++++++++++--- include/wine/wined3d.h | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 893340e..19575b1 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -157,7 +157,8 @@ static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) TRACE("iface %p, adapter %u.\n", iface, adapter); wined3d_mutex_lock(); - hr = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, 0); + hr = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 97a5bcb..02b2360 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -164,7 +164,8 @@ static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(format)); + ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); return ret; @@ -477,9 +478,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter) { - FIXME("iface %p, adapter %u, filter %p stub!\n", iface, adapter, filter); + struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + UINT ret; + + TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter); + + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) + return 0; - return 0; + wined3d_mutex_lock(); + ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); + wined3d_mutex_unlock(); + + return ret; } static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index ecc9a10..4876507 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -146,7 +146,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa wined3d_format = wined3dformat_from_dxgi_format(format); EnterCriticalSection(&dxgi_cs); - max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, wined3d_format); + max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!desc) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a9e41ce..aef06af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2892,7 +2892,7 @@ HMONITOR CDECL wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT a /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id) + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) { const struct wined3d_adapter *adapter; const struct wined3d_format *format; @@ -2901,7 +2901,8 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad UINT format_bits; DEVMODEW mode; - TRACE("wined3d %p, adapter_idx %u, format %s.\n", wined3d, adapter_idx, debug_d3dformat(format_id)); + TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", + wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); if (adapter_idx >= wined3d->adapter_count) return 0; @@ -2915,6 +2916,17 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) { + if (mode.dmFields & DM_DISPLAYFLAGS) + { + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE + && (mode.u2.dmDisplayFlags & DM_INTERLACED)) + continue; + + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED + && !(mode.u2.dmDisplayFlags & DM_INTERLACED)) + continue; + } + if (format_id == WINED3DFMT_UNKNOWN) { /* This is for d3d8, do not enumerate P8 here. */ @@ -4406,7 +4418,8 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap } /* If the requested display format is not available, don't continue. */ - mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, display_format); + mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!mode_count) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5e95917..f346455 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2043,8 +2043,8 @@ HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); -UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, - UINT adapter_idx, enum wined3d_format_id format_id); +UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, WINED3DCAPS *caps);

1 0

Henri Verbeet : d3d9: Implement d3d9_device_PresentEx().
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_get_adapter_identifier ().
by Alexandre Julliard 29 Jun '12

29 Jun '12

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_set_adapter_display_mode ().
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_get_adapter_display_mode ().
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Owen Rudge : msvcp90: Sync spec files.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 2e167f68885f59a02db72faf1254209b5189c501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e167f68885f59a02db72faf1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jun 28 11:46:50 2012 +0100 msvcp90: Sync spec files. --- dlls/msvcp70/msvcp70.spec | 58 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 58 ++++++++++++++++++++++---------------------- dlls/msvcp80/msvcp80.spec | 58 ++++++++++++++++++++++---------------------- 3 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e167f68885f59a02db72…

1 0

← Newer
1
2
3
4
5
6
7
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012