November 2012 - Wine-Commits

Nikolay Sivov : xmllite: Add partial support for xml declaration parsing.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: acb56b0796ec53b37789977e600c2839156d0da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb56b0796ec53b37789977e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 25 21:59:49 2012 -0500 xmllite: Add partial support for xml declaration parsing. --- dlls/xmllite/reader.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 142 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b0ceac4..0d21e79 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010 Nikolay Sivov + * Copyright 2010, 2012 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,7 +48,7 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; struct xml_encoding_data { - const WCHAR *encoding; + const WCHAR *name; xml_encoding enc; UINT cp; }; @@ -213,11 +213,11 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) return S_OK; } -static xml_encoding parse_encoding_name(const WCHAR *encoding) +static xml_encoding parse_encoding_name(const WCHAR *name) { int min, max, n, c; - if (!encoding) return XmlEncoding_Unknown; + if (!name) return XmlEncoding_Unknown; min = 0; max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; @@ -226,7 +226,7 @@ static xml_encoding parse_encoding_name(const WCHAR *encoding) { n = (min+max)/2; - c = strcmpiW(xml_encoding_map[n].encoding, encoding); + c = strcmpiW(xml_encoding_map[n].name, name); if (!c) return xml_encoding_map[n].enc; @@ -431,6 +431,136 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding readerinput->buffer->code_page = cp; } +static inline const WCHAR *reader_get_cur(xmlreader *reader) +{ + return (WCHAR*)reader->input->buffer->utf16.cur; +} + +static int reader_cmp(xmlreader *reader, const WCHAR *str) +{ + const WCHAR *ptr = reader_get_cur(reader); + int i = 0; + + return strncmpW(str, ptr, strlenW(str)); + + while (str[i]) { + if (ptr[i] != str[i]) return 0; + i++; + } + + return 1; +} + +/* moves cursor n WCHARs forward */ +static void reader_skipn(xmlreader *reader, int n) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader); + + while (*ptr++ && n--) + { + buffer->cur += sizeof(WCHAR); + reader->pos++; + } +} + +/* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ +static int reader_skipspaces(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader), *start = ptr; + + while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + { + buffer->cur += sizeof(WCHAR); + if (*ptr == '\r') + reader->pos = 0; + else if (*ptr == '\n') + { + reader->line++; + reader->pos = 0; + } + else + reader->pos++; + ptr++; + } + + return ptr - start; +} + +/* [26] VersionNum ::= '1.' [0-9]+ */ +static HRESULT reader_parse_versionnum(xmlreader *reader) +{ + const WCHAR *ptr, *start = reader_get_cur(reader); + static const WCHAR onedotW[] = {'1','.',0}; + + if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; + /* skip "1." */ + reader_skipn(reader, 2); + + ptr = reader_get_cur(reader); + while (*ptr >= '0' && *ptr <= '9') + ptr++; + + if (ptr == start) return WC_E_DIGIT; + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); + reader_skipn(reader, ptr-start); + return S_OK; +} + +/* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ +static HRESULT reader_parse_versioninfo(xmlreader *reader) +{ + static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + static const WCHAR dblquoteW[] = {'\"',0}; + static const WCHAR quoteW[] = {'\'',0}; + static const WCHAR eqW[] = {'=',0}; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + /* skip 'version' */ + reader_skipn(reader, 7); + + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_versionnum(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return S_OK; +} + +/* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ +static HRESULT reader_parse_xmldecl(xmlreader *reader) +{ + static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + HRESULT hr; + + /* check if we have "<?xml" */ + if (reader_cmp(reader, xmldeclW)) return S_OK; + + reader_skipn(reader, 5); + hr = reader_parse_versioninfo(reader); + if (FAILED(hr)) + return hr; + + return E_NOTIMPL; +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -586,11 +716,17 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(This->input, &enc); - TRACE("detected encoding %d, 0x%08x\n", enc, hr); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; /* always switch first time cause we have to put something in */ readerinput_switchencoding(This->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(This); + if (FAILED(hr)) return hr; + + This->state = XmlReadState_Interactive; } return E_NOTIMPL;

1 0

Nikolay Sivov : xmllite: Implement initial encoding switching.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: eddd7fcf29994645e4047fe9738109defa78100d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddd7fcf29994645e4047fe97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 25 00:10:46 2012 -0500 xmllite: Implement initial encoding switching. --- dlls/xmllite/reader.c | 127 +++++++++++++++++++++++++++++++++++-------- dlls/xmllite/tests/reader.c | 2 +- 2 files changed, 106 insertions(+), 23 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8ad78d8..b0ceac4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -61,6 +61,7 @@ static const struct xml_encoding_data xml_encoding_map[] = { typedef struct { char *data; + char *cur; unsigned int allocated; unsigned int written; } encoded_buffer; @@ -187,6 +188,7 @@ static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer if (!buffer->data) return E_OUTOFMEMORY; memset(buffer->data, 0, 4); + buffer->cur = buffer->data; buffer->allocated = initial_len; buffer->written = 0; @@ -198,18 +200,15 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) +static HRESULT get_code_page(xml_encoding encoding, UINT *cp) { - const struct xml_encoding_data *data; - if (encoding == XmlEncoding_Unknown) { FIXME("unsupported encoding %d\n", encoding); return E_NOTIMPL; } - data = &xml_encoding_map[encoding]; - input->buffer->code_page = data->cp; + *cp = xml_encoding_map[encoding].cp; return S_OK; } @@ -324,31 +323,112 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) return hr; } -static xml_encoding readerinput_detectencoding(xmlreaderinput *readerinput) +/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +static void readerinput_grow(xmlreaderinput *readerinput, int length) +{ + encoded_buffer *buffer = &readerinput->buffer->utf16; + + /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ + if (buffer->allocated < buffer->written + length + 4) + { + int grown_size = max(2*buffer->allocated, buffer->allocated + length); + buffer->data = readerinput_realloc(readerinput, buffer->data, grown_size); + buffer->allocated = grown_size; + } +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + + *enc = XmlEncoding_Unknown; + + if (buffer->written <= 3) return MX_E_INPUTEND; /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (buffer->written >= 4) + if (!memcmp(buffer->data, startA, sizeof(startA))) + *enc = XmlEncoding_UTF8; + else if (!memcmp(buffer->data, startW, sizeof(startW))) + *enc = XmlEncoding_UTF16; + /* try with BOM now */ + else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) { - static char startA[] = {'<','?','x','m'}; - static WCHAR startW[] = {'<','?'}; - - if (!memcmp(buffer->data, startA, sizeof(startA))) return XmlEncoding_UTF8; - if (!memcmp(buffer->data, startW, sizeof(startW))) return XmlEncoding_UTF16; + buffer->cur += sizeof(utf8bom); + *enc = XmlEncoding_UTF8; + } + else if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) + { + buffer->cur += sizeof(utf16lebom); + *enc = XmlEncoding_UTF16; } - /* try with BOM now */ - if (buffer->written >= 3) + return S_OK; +} + +static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + /* complete single byte char */ + if (!(buffer->data[len-1] & 0x80)) return len; + + /* find start byte of multibyte char */ + while (--len && !(buffer->data[len] & 0xc0)) + ; + + return len; +} + +/* returns byte length of complete char sequence for specified code page, */ +static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + if (cp == CP_UTF8) + len = readerinput_get_utf8_convlen(readerinput); + else + len = buffer->written; + + return len - (buffer->cur - buffer->data); +} + +/* note that raw buffer content is kept */ +static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding enc) +{ + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + int len, dest_len; + HRESULT hr; + UINT cp; + + hr = get_code_page(enc, &cp); + if (FAILED(hr)) return; + + len = readerinput_get_convlen(readerinput, cp); + + TRACE("switching to cp %d\n", cp); + + /* just copy in this case */ + if (enc == XmlEncoding_UTF16) { - static char utf8bom[] = {0xef,0xbb,0xbf}; - static char utf16lebom[] = {0xff,0xfe}; - if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) return XmlEncoding_UTF8; - if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) return XmlEncoding_UTF16; + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + readerinput->buffer->code_page = cp; + return; } - return XmlEncoding_Unknown; + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); + dest->data[dest_len] = 0; + readerinput->buffer->code_page = cp; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -505,9 +585,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) if (FAILED(hr)) return hr; /* try to detect encoding by BOM or data and set input code page */ - enc = readerinput_detectencoding(This->input); - TRACE("detected encoding %d\n", enc); - get_code_page(enc, This->input); + hr = readerinput_detectencoding(This->input, &enc); + TRACE("detected encoding %d, 0x%08x\n", enc, hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(This->input, enc); } return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7d77fe9..729d134 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -52,7 +52,7 @@ static const char *debugstr_guid(REFIID riid) return buf; } -static const char xmldecl_full[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static IStream *create_stream_on_data(const char *data, int size) {

1 0

Nikolay Sivov : dwrite: Implement family name access methods for IDWriteTextFormat.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 22f19708342572182735bd2738dc39ebb25cdd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f19708342572182735bd273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 10:43:49 2012 -0500 dwrite: Implement family name access methods for IDWriteTextFormat. --- dlls/dwrite/layout.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f6bc421..8e63f5c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textformat_data { WCHAR *family_name; + UINT32 family_len; WCHAR *locale; UINT32 locale_len; @@ -880,15 +881,19 @@ static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *ifac static UINT32 WINAPI dwritetextformat_GetFontFamilyNameLength(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.family_len; } static HRESULT WINAPI dwritetextformat_GetFontFamilyName(IDWriteTextFormat *iface, WCHAR *name, UINT32 size) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.family_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.family_name); + return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritetextformat_GetFontWeight(IDWriteTextFormat *iface) @@ -981,6 +986,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; This->format.family_name = heap_strdupW(family_name); + This->format.family_len = strlenW(family_name); This->format.locale = heap_strdupW(locale); This->format.locale_len = strlenW(locale); This->format.weight = weight;

1 0

Nikolay Sivov : ole32: Fix OleDraw() regarding passed rectangle handling.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 6a8b4f11a876f16090591f1c4b834e56cc783b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8b4f11a876f16090591f1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 12:49:59 2012 -0500 ole32: Fix OleDraw() regarding passed rectangle handling. --- dlls/ole32/ole2.c | 14 +------ dlls/ole32/tests/ole2.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6a91ba6..7e55fb2 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2554,7 +2554,7 @@ HRESULT WINAPI OleDraw( IUnknown *pUnk, DWORD dwAspect, HDC hdcDraw, - LPCRECT lprcBounds) + LPCRECT rect) { HRESULT hres; IViewObject *viewobject; @@ -2562,24 +2562,14 @@ HRESULT WINAPI OleDraw( hres = IUnknown_QueryInterface(pUnk, &IID_IViewObject, (void**)&viewobject); - if (SUCCEEDED(hres)) { - RECTL rectl; - - rectl.left = lprcBounds->left; - rectl.right = lprcBounds->right; - rectl.top = lprcBounds->top; - rectl.bottom = lprcBounds->bottom; - hres = IViewObject_Draw(viewobject, dwAspect, -1, 0, 0, 0, hdcDraw, &rectl, 0, 0, 0); - + hres = IViewObject_Draw(viewobject, dwAspect, -1, 0, 0, 0, hdcDraw, (RECTL*)rect, 0, 0, 0); IViewObject_Release(viewobject); return hres; } else - { return DV_E_NOIVIEWOBJECT; - } } /*********************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8dd3606..eb8e6d3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -726,6 +726,84 @@ static IRunnableObject OleObjectRunnable = { &OleObjectRunnableVtbl }; static const CLSID CLSID_Equation3 = {0x0002CE02, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +static HRESULT WINAPI viewobject_QueryInterface(IViewObject *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IViewObject)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI viewobject_AddRef(IViewObject *iface) +{ + return 2; +} + +static ULONG WINAPI viewobject_Release(IViewObject *iface) +{ + return 1; +} + +static HRESULT WINAPI viewobject_Draw(IViewObject *iface, DWORD aspect, LONG index, + void *paspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, + LPCRECTL bounds, LPCRECTL wbounds, BOOL (STDMETHODCALLTYPE *pfnContinue)(ULONG_PTR dwContinue), + ULONG_PTR dwContinue) +{ + ok(index == -1, "index=%d\n", index); + return S_OK; +} + +static HRESULT WINAPI viewobject_GetColorSet(IViewObject *iface, DWORD draw_aspect, LONG index, + void *aspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **colorset) +{ + ok(0, "unexpected call GetColorSet\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_Freeze(IViewObject *iface, DWORD draw_aspect, LONG index, + void *aspect, DWORD *freeze) +{ + ok(0, "unexpected call Freeze\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_Unfreeze(IViewObject *iface, DWORD freeze) +{ + ok(0, "unexpected call Unfreeze\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_SetAdvise(IViewObject *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) +{ + ok(0, "unexpected call SetAdvise\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_GetAdvise(IViewObject *iface, DWORD *aspects, DWORD *advf, + IAdviseSink **sink) +{ + ok(0, "unexpected call GetAdvise\n"); + return E_NOTIMPL; +} + +static const struct IViewObjectVtbl viewobjectvtbl = { + viewobject_QueryInterface, + viewobject_AddRef, + viewobject_Release, + viewobject_Draw, + viewobject_GetColorSet, + viewobject_Freeze, + viewobject_Unfreeze, + viewobject_SetAdvise, + viewobject_GetAdvise +}; + +static IViewObject viewobject = { &viewobjectvtbl }; + static void test_OleCreate(IStorage *pStorage) { HRESULT hr; @@ -1853,6 +1931,14 @@ static void test_OleLockRunning(void) ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); } +static void test_OleDraw(void) +{ + HRESULT hr; + + hr = OleDraw((IUnknown*)&viewobject, 0, (HDC)0x1, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + START_TEST(ole2) { DWORD dwRegister; @@ -1889,6 +1975,7 @@ START_TEST(ole2) test_default_handler(); test_runnable(); test_OleLockRunning(); + test_OleDraw(); CoUninitialize(); }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXINCLUDE.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 69eeb35e51d2fc7bbb05af1f69fc2fbb9521e9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=69eeb35e51d2fc7bbb05af1f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:05 2012 +0100 d3dx9: Avoid LPD3DXINCLUDE. --- dlls/d3dx9_36/effect.c | 27 +++++++--------- dlls/d3dx9_36/shader.c | 81 +++++++++++----------------------------------- include/d3dx9effect.h | 45 +++++++------------------- include/d3dx9shader.h | 83 ++++++++++++----------------------------------- 4 files changed, 65 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69eeb35e51d2fc7bbb05a…

1 0

Frédéric Delanoy : ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity).
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 80d30100993013dfdaa32d0e6c938246b5f75cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d30100993013dfdaa32d0e6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 23 19:36:14 2012 +0100 ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity). --- dlls/ddraw/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d990440..1964452 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -446,6 +446,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } WARN("32 bit RGB pixel format does not match.\n"); + return WINED3DFMT_UNKNOWN; default: WARN("Invalid dwRGBBitCount in Pixelformat structure.\n");

1 0

André Hentschel : include: Add more CV constants.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 696950b581c2a7650a23b1f462cda79a22e9eb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696950b581c2a7650a23b1f46… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 23 16:55:27 2012 +0100 include: Add more CV constants. --- include/cvconst.h | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 139 insertions(+), 5 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 00e64ae..84ff3a0 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -2,6 +2,7 @@ * File cvconst.h - MS debug information * * Copyright (C) 2004, Eric Pouech + * Copyright (C) 2012, André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +133,9 @@ enum CV_HREG_e CV_ALLREG_HANDLE = 30007, CV_ALLREG_PARAMS = 30008, CV_ALLREG_LOCALS = 30009, + CV_ALLREG_TID = 30010, + CV_ALLREG_ENV = 30011, + CV_ALLREG_CMDLN = 30012, /* Intel x86 CPU */ CV_REG_NONE = 0, @@ -224,6 +228,33 @@ enum CV_HREG_e CV_REG_MM70 = 250, CV_REG_MM71 = 251, + CV_REG_YMM0 = 252, /* this includes YMM1 to YMM7 */ + CV_REG_YMM0H = 260, /* this includes YMM1H to YMM7H */ + CV_REG_YMM0I0 = 268, /* this includes YMM0I1 to YMM0I3 */ + CV_REG_YMM1I0 = 272, /* this includes YMM1I1 to YMM1I3 */ + CV_REG_YMM2I0 = 276, /* this includes YMM2I1 to YMM2I3 */ + CV_REG_YMM3I0 = 280, /* this includes YMM3I1 to YMM3I3 */ + CV_REG_YMM4I0 = 284, /* this includes YMM4I1 to YMM4I3 */ + CV_REG_YMM5I0 = 288, /* this includes YMM5I1 to YMM5I3 */ + CV_REG_YMM6I0 = 292, /* this includes YMM6I1 to YMM6I3 */ + CV_REG_YMM7I0 = 296, /* this includes YMM7I1 to YMM7I3 */ + CV_REG_YMM0F0 = 300, /* this includes YMM0F1 to YMM0F7 */ + CV_REG_YMM1F0 = 308, /* this includes YMM1F1 to YMM1F7 */ + CV_REG_YMM2F0 = 316, /* this includes YMM2F1 to YMM2F7 */ + CV_REG_YMM3F0 = 324, /* this includes YMM3F1 to YMM3F7 */ + CV_REG_YMM4F0 = 332, /* this includes YMM4F1 to YMM4F7 */ + CV_REG_YMM5F0 = 340, /* this includes YMM5F1 to YMM5F7 */ + CV_REG_YMM6F0 = 348, /* this includes YMM6F1 to YMM6F7 */ + CV_REG_YMM7F0 = 356, /* this includes YMM7F1 to YMM7F7 */ + CV_REG_YMM0D0 = 364, /* this includes YMM0D1 to YMM0D3 */ + CV_REG_YMM1D0 = 368, /* this includes YMM1D1 to YMM1D3 */ + CV_REG_YMM2D0 = 372, /* this includes YMM2D1 to YMM2D3 */ + CV_REG_YMM3D0 = 376, /* this includes YMM3D1 to YMM3D3 */ + CV_REG_YMM4D0 = 380, /* this includes YMM4D1 to YMM4D3 */ + CV_REG_YMM5D0 = 384, /* this includes YMM5D1 to YMM5D3 */ + CV_REG_YMM6D0 = 388, /* this includes YMM6D1 to YMM6D3 */ + CV_REG_YMM7D0 = 392, /* this includes YMM7D1 to YMM7D3 */ + /* Motorola 68K CPU */ CV_R68_D0 = 0, /* this includes D1 to D7 too */ CV_R68_A0 = 8, /* this includes A1 to A7 too */ @@ -287,7 +318,7 @@ enum CV_HREG_e CV_M4_Psr = 51, CV_M4_FltF0 = 60, /* this includes FltF1 to Flt31 */ CV_M4_FltFsr = 92, - + /* Alpha AXP CPU */ CV_ALPHA_NOREG = CV_REG_NONE, CV_ALPHA_FltF0 = 10, /* this includes FltF1 to FltF31 */ @@ -311,7 +342,7 @@ enum CV_HREG_e CV_ALPHA_Psr = 76, CV_ALPHA_FltFsr = 77, CV_ALPHA_SoftFpcr = 78, - + /* Motorola & IBM PowerPC CPU */ CV_PPC_GPR0 = 1, /* this includes GPR1 to GPR31 */ CV_PPC_CR = 33, @@ -321,7 +352,53 @@ enum CV_HREG_e CV_PPC_FPSCR = 74, CV_PPC_MSR = 75, CV_PPC_SR0 = 76, /* this includes SR1 to SR15 */ - /* some PPC registers missing */ + CV_PPC_PC = 99, + CV_PPC_MQ = 100, + CV_PPC_XER = 101, + CV_PPC_RTCU = 104, + CV_PPC_RTCL = 105, + CV_PPC_LR = 108, + CV_PPC_CTR = 109, + CV_PPC_COMPARE = 110, + CV_PPC_COUNT = 111, + CV_PPC_DSISR = 118, + CV_PPC_DAR = 119, + CV_PPC_DEC = 122, + CV_PPC_SDR1 = 125, + CV_PPC_SRR0 = 126, + CV_PPC_SRR1 = 127, + CV_PPC_SPRG0 = 372, /* this includes SPRG1 to SPRG3 */ + CV_PPC_ASR = 280, + CV_PPC_EAR = 382, + CV_PPC_PVR = 287, + CV_PPC_BAT0U = 628, + CV_PPC_BAT0L = 629, + CV_PPC_BAT1U = 630, + CV_PPC_BAT1L = 631, + CV_PPC_BAT2U = 632, + CV_PPC_BAT2L = 633, + CV_PPC_BAT3U = 634, + CV_PPC_BAT3L = 635, + CV_PPC_DBAT0U = 636, + CV_PPC_DBAT0L = 637, + CV_PPC_DBAT1U = 638, + CV_PPC_DBAT1L = 639, + CV_PPC_DBAT2U = 640, + CV_PPC_DBAT2L = 641, + CV_PPC_DBAT3U = 642, + CV_PPC_DBAT3L = 643, + CV_PPC_PMR0 = 1044, /* this includes PMR1 to PMR15 */ + CV_PPC_DMISS = 1076, + CV_PPC_DCMP = 1077, + CV_PPC_HASH1 = 1078, + CV_PPC_HASH2 = 1079, + CV_PPC_IMISS = 1080, + CV_PPC_ICMP = 1081, + CV_PPC_RPA = 1082, + CV_PPC_HID0 = 1108, /* this includes HID1 to HID15 */ + + /* Java */ + CV_JAVA_PC = 1, /* Hitachi SH3 CPU */ CV_SH3_NOREG = CV_REG_NONE, @@ -357,7 +434,29 @@ enum CV_HREG_e CV_ARM_LR = 24, CV_ARM_PC = 25, CV_ARM_CPSR = 26, - + CV_ARM_ACC0 = 27, + CV_ARM_FPSCR = 40, + CV_ARM_FPEXC = 41, + CV_ARM_FS0 = 50, /* this includes FS1 to FS31 */ + CV_ARM_FPEXTRA0 = 90, /* this includes FPEXTRA1 to FPEXTRA7 */ + CV_ARM_WR0 = 128, /* this includes WR1 to WR15 */ + CV_ARM_WCID = 144, + CV_ARM_WCON = 145, + CV_ARM_WCSSF = 146, + CV_ARM_WCASF = 147, + CV_ARM_WC4 = 148, + CV_ARM_WC5 = 149, + CV_ARM_WC6 = 150, + CV_ARM_WC7 = 151, + CV_ARM_WCGR0 = 152, /* this includes WCGR1 to WCGR3 */ + CV_ARM_WC12 = 156, + CV_ARM_WC13 = 157, + CV_ARM_WC14 = 158, + CV_ARM_WC15 = 159, + CV_ARM_FS32 = 200, /* this includes FS33 to FS63 */ + CV_ARM_ND0 = 300, /* this includes ND1 to ND31 */ + CV_ARM_NQ0 = 400, /* this includes NQ1 to NQ15 */ + /* Intel IA64 CPU */ CV_IA64_NOREG = CV_REG_NONE, CV_IA64_Br0 = 512, /* this includes Br1 to Br7 */ @@ -395,7 +494,31 @@ enum CV_HREG_e CV_TRI_EA10 = 55, CV_TRI_EA12 = 56, CV_TRI_EA14 = 57, - /* some TriCode registers missing */ + CV_TRI_PSW = 58, + CV_TRI_PCXI = 59, + CV_TRI_PC = 60, + CV_TRI_FCX = 61, + CV_TRI_LCX = 62, + CV_TRI_ISP = 63, + CV_TRI_ICR = 64, + CV_TRI_BIV = 65, + CV_TRI_BTV = 66, + CV_TRI_SYSCON = 67, + CV_TRI_DPRx_0 = 68, /* includes DPRx_1 to DPRx_3 */ + CV_TRI_CPRx_0 = 68, /* includes CPRx_1 to CPRx_3 */ + CV_TRI_DPMx_0 = 68, /* includes DPMx_1 to DPMx_3 */ + CV_TRI_CPMx_0 = 68, /* includes CPMx_1 to CPMx_3 */ + CV_TRI_DBGSSR = 72, + CV_TRI_EXEVT = 73, + CV_TRI_SWEVT = 74, + CV_TRI_CREVT = 75, + CV_TRI_TRnEVT = 76, + CV_TRI_MMUCON = 77, + CV_TRI_ASI = 78, + CV_TRI_TVA = 79, + CV_TRI_TPA = 80, + CV_TRI_TPX = 81, + CV_TRI_TFA = 82, /* AM33 (and the likes) CPU */ CV_AM33_NOREG = CV_REG_NONE, @@ -403,6 +526,17 @@ enum CV_HREG_e CV_AM33_A0 = 20, /* this includes A1 to A3 */ CV_AM33_D0 = 30, /* this includes D1 to D3 */ CV_AM33_FS0 = 40, /* this includes FS1 to FS31 */ + CV_AM33_SP = 80, + CV_AM33_PC = 81, + CV_AM33_MDR = 82, + CV_AM33_MDRQ = 83, + CV_AM33_MCRH = 84, + CV_AM33_MCRL = 85, + CV_AM33_MCVF = 86, + CV_AM33_EPSW = 87, + CV_AM33_FPCR = 88, + CV_AM33_LIR = 89, + CV_AM33_LAR = 90, /* Mitsubishi M32R CPU */ CV_M32R_NOREG = CV_REG_NONE,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPRTENGINE.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 69f059cdd7c3b14ada563353f257a67cd96f04d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f059cdd7c3b14ada563353f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:07 2012 +0100 d3dx9: Avoid LPD3DXPRTENGINE. --- include/d3dx9mesh.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index e0b8557..a5fc6cc 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -711,7 +711,8 @@ HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *) HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); -HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); +HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, + ID3DXMesh *blocker_mesh, ID3DXPRTEngine **engine); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXMesh **mesh);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetInputLayout().
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 86779241c6c3969b50c8fbd50a943f47c2b3458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86779241c6c3969b50c8fbd50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:08 2012 +0100 d3d10core: Implement d3d10_device_IAGetInputLayout(). --- dlls/d3d10core/device.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0623ee5..3ac02a0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -548,7 +548,21 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, ID3D10InputLayout **input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_vertex_declaration *wined3d_declaration; + struct d3d10_input_layout *input_layout_impl; + + TRACE("iface %p, input_layout %p.\n", iface, input_layout); + + if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + { + *input_layout = NULL; + return; + } + + input_layout_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *input_layout = &input_layout_impl->ID3D10InputLayout_iface; + ID3D10InputLayout_AddRef(*input_layout); } static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface,

1 0

Henri Verbeet : winex11: Detect broken NVIDIA RandR setups.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 8776e1c0e1597fec169d169888660deb5bb08c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8776e1c0e1597fec169d16988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:09 2012 +0100 winex11: Detect broken NVIDIA RandR setups. --- dlls/winex11.drv/xrandr.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 1093541..5b2dede 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -24,6 +24,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBXRANDR @@ -419,6 +420,21 @@ static int xrandr12_init_modes(void) goto done; } + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + goto done; + } + if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n");

1 0