wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Alexandre Julliard : winex11: Force setting the cursor again on the first mouse event in case the initial setting failed .
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 536fc57091a80135ac1d6a3fceda3e7a87389897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536fc57091a80135ac1d6a3fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:07:24 2010 +0200 winex11: Force setting the cursor again on the first mouse event in case the initial setting failed. --- dlls/winex11.drv/window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 68084d0..dade30e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -430,6 +430,10 @@ static void sync_window_cursor( struct x11drv_win_data *data ) SERVER_END_REQ; set_window_cursor( data->hwnd, cursor ); + + /* setting the cursor can fail if the window isn't created yet */ + /* so make sure that we try again once we receive a mouse event */ + data->cursor = (HANDLE)~0u; }

1 0

Damjan Jovanovic : windowscodecs: Support ICO files with embedded PNGs.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 666940902db2c69334d8c56f068696e88b0f1dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=666940902db2c69334d8c56f0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 29 21:24:08 2010 +0200 windowscodecs: Support ICO files with embedded PNGs. --- dlls/windowscodecs/icoformat.c | 49 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index f51b7d1..33fea1f 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -343,6 +343,52 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) return hr; } +static HRESULT ReadIcoPng(IStream *stream, IcoFrameDecode *result) +{ + IWICBitmapDecoder *decoder = NULL; + IWICBitmapFrameDecode *sourceFrame = NULL; + IWICBitmapSource *sourceBitmap = NULL; + WICRect rect; + HRESULT hr; + + hr = PngDecoder_CreateInstance(NULL, &IID_IWICBitmapDecoder, (void**)&decoder); + if (FAILED(hr)) + goto end; + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnLoad); + if (FAILED(hr)) + goto end; + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &sourceFrame); + if (FAILED(hr)) + goto end; + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)sourceFrame, &sourceBitmap); + if (FAILED(hr)) + goto end; + hr = IWICBitmapFrameDecode_GetSize(sourceFrame, &result->width, &result->height); + if (FAILED(hr)) + goto end; + result->bits = HeapAlloc(GetProcessHeap(), 0, 4 * result->width * result->height); + if (result->bits == NULL) + { + hr = E_OUTOFMEMORY; + goto end; + } + rect.X = 0; + rect.Y = 0; + rect.Width = result->width; + rect.Height = result->height; + hr = IWICBitmapSource_CopyPixels(sourceBitmap, &rect, 4*result->width, + 4*result->width*result->height, result->bits); + +end: + if (decoder != NULL) + IWICBitmapDecoder_Release(decoder); + if (sourceFrame != NULL) + IWICBitmapFrameDecode_Release(sourceFrame); + if (sourceBitmap != NULL) + IWICBitmapSource_Release(sourceBitmap); + return hr; +} + static HRESULT WINAPI IcoDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -576,8 +622,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, hr = ReadIcoDib((IStream*)substream, result); break; case 0x474e5089: - FIXME("PNG decoding not supported\n"); - hr = E_FAIL; + hr = ReadIcoPng((IStream*)substream, result); break; default: FIXME("Unrecognized ICO frame magic: %x\n", magic);

1 0

Adam Martinson : msxml3: Expose the XML parser SAX callback interface.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 776a8662f088e75e88284cc0fc8e72d768771a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=776a8662f088e75e88284cc0f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Sep 29 16:04:38 2010 -0500 msxml3: Expose the XML parser SAX callback interface. This eliminates a few function calls; libxml will call this indirectly through the old method. By writing our own callback functions or wrapping the default ones we can manipulate the xmlDoc as it's being parsed, allowing us to match the way msxml parses. --- dlls/msxml3/domdoc.c | 59 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8d6c5f1..ad1a858 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xpathInternals.h> #include <libxml/xmlsave.h> +#include <libxml/SAX2.h> /* not defined in older versions */ #define XML_SAVE_FORMAT 1 @@ -287,21 +288,47 @@ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) return node; } -static xmlDocPtr doparse( char *ptr, int len, const char *encoding ) +static xmlDocPtr doparse(domdoc* This, char *ptr, int len) { xmlDocPtr doc; - -#ifdef HAVE_XMLREADMEMORY - /* - * use xmlReadMemory if possible so we can suppress - * writing errors to stderr - */ - doc = xmlReadMemory( ptr, len, NULL, encoding, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); -#else - doc = xmlParseMemory( ptr, len ); -#endif - + static xmlSAXHandler sax_handler = { + xmlSAX2InternalSubset, /* internalSubset */ + xmlSAX2IsStandalone, /* isStandalone */ + xmlSAX2HasInternalSubset, /* hasInternalSubset */ + xmlSAX2HasExternalSubset, /* hasExternalSubset */ + xmlSAX2ResolveEntity, /* resolveEntity */ + xmlSAX2GetEntity, /* getEntity */ + xmlSAX2EntityDecl, /* entityDecl */ + xmlSAX2NotationDecl, /* notationDecl */ + xmlSAX2AttributeDecl, /* attributeDecl */ + xmlSAX2ElementDecl, /* elementDecl */ + xmlSAX2UnparsedEntityDecl, /* unparsedEntityDecl */ + xmlSAX2SetDocumentLocator, /* setDocumentLocator */ + xmlSAX2StartDocument, /* startDocument */ + xmlSAX2EndDocument, /* endDocument */ + xmlSAX2StartElement, /* startElement */ + xmlSAX2EndElement, /* endElement */ + xmlSAX2Reference, /* reference */ + xmlSAX2Characters, /* characters */ + NULL, /* TODO: ignorableWhitespace */ + xmlSAX2ProcessingInstruction, /* processingInstruction */ + xmlSAX2Comment, /* comment */ + NULL, /* TODO: warning */ + NULL, /* TODO: error */ + NULL, /* TODO: fatalError */ + xmlSAX2GetParameterEntity, /* getParameterEntity */ + xmlSAX2CDataBlock, /* cdataBlock */ + xmlSAX2ExternalSubset, /* externalSubset */ + 0, /* initialized */ + NULL, /* _private */ + xmlSAX2StartElementNs, /* startElementNs */ + xmlSAX2EndElementNs, /* endElementNs */ + NULL /* TODO: serror */ + }; + + doc = xmlSAXParseMemoryWithData(&sax_handler, ptr, len, 0, This); + + /* TODO: put this in one of the SAX callbacks */ /* create first child as a <?xml...?> */ if (doc && doc->standalone != -1) { @@ -531,7 +558,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = doparse(ptr, len, NULL); + xmldoc = doparse(This, ptr, len); GlobalUnlock(hglobal); if (!xmldoc) @@ -1718,7 +1745,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) domdoc *This = obj; xmlDocPtr xmldoc; - xmldoc = doparse( ptr, len, NULL ); + xmldoc = doparse(This, ptr, len); if(xmldoc) { xmldoc->_private = create_priv(); return attach_xmldoc(This, xmldoc); @@ -1956,7 +1983,7 @@ static HRESULT WINAPI domdoc_loadXML( if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) { - xmldoc = doparse( str, len, "UTF-8" ); + xmldoc = doparse(This, str, len); heap_free( str ); if ( !xmldoc ) This->error = E_FAIL;

1 0

Vitaly Perov : shdocvw: Silence QueryInterface FIXME.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 042ecec8b6bddb617e3a01f534b6e7ca2eb1cba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042ecec8b6bddb617e3a01f53… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Wed Sep 29 16:01:36 2010 +0400 shdocvw: Silence QueryInterface FIXME. --- dlls/shdocvw/tests/webbrowser.c | 5 +++++ dlls/shdocvw/webbrowser.c | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 85f71b7..04a0b8e 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2436,6 +2436,7 @@ static void test_QueryInterface(IUnknown *unk) IOleCache *cache = (void*)0xdeadbeef; IObjectWithSite *site = (void*)0xdeadbeef; IViewObjectEx *viewex = (void*)0xdeadbeef; + IOleLink *link = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -2466,6 +2467,10 @@ static void test_QueryInterface(IUnknown *unk) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(viewex == NULL, "viewex=%p, expected NULL\n", viewex); + hres = IUnknown_QueryInterface(unk, &IID_IOleLink, (void**)&link); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(link == NULL, "link=%p, expected NULL\n", link); + } static void test_WebBrowser(BOOL do_download) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 5115de7..0c1bb12 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -127,6 +127,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { TRACE("(%p)->(IID_IViewObjectEx %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IOleLink, riid)) { + TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK; }

1 0

Jacek Caban : urlmon: Skip tests on IEs older than 6 by checking for CompareSecurityIds.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 651fc5a2896343c16f1c0a1dc203fc256c3c4219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=651fc5a2896343c16f1c0a1dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 30 13:02:44 2010 +0200 urlmon: Skip tests on IEs older than 6 by checking for CompareSecurityIds. --- dlls/urlmon/tests/misc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 558fc42..0dacd12 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -74,6 +74,7 @@ static HRESULT (WINAPI *pFindMimeFromData)(LPBC, LPCWSTR, LPVOID, DWORD, LPCWSTR static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*); static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD); +static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static void test_CreateFormatEnum(void) @@ -1472,10 +1473,11 @@ START_TEST(misc) pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString"); pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); + pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || - !pCoInternetGetSession || !pCoInternetParseUrl) { - win_skip("Various needed functions not present in IE 4.0\n"); + !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { + win_skip("Various needed functions not present, too old IE\n"); return; }

1 0

Alexandre Julliard : msi/tests: Fix a test failure on 64-bit.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: b4109a079fff2287fb123a253008e69f8d80e8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4109a079fff2287fb123a253… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 14:12:55 2010 +0200 msi/tests: Fix a test failure on 64-bit. --- dlls/msi/tests/automation.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f883eac..07760d9 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2546,8 +2546,9 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Remove registry keys written by RegisterProduct standard action */ - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}"); + res = delete_key_portable(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", + KEY_WOW64_32KEY); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = delete_key_portable(HKEY_LOCAL_MACHINE,

1 0

Alexandre Julliard : msi/tests: Avoid corrupting the pending file renames key on failure.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 9fe16f8ae9d955508221caf00f4e135c5854fc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe16f8ae9d955508221caf00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 13:42:37 2010 +0200 msi/tests: Avoid corrupting the pending file renames key on failure. --- dlls/msi/tests/install.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 345c63f..11b1de1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -8995,17 +8995,18 @@ static char rename_ops[] = "PendingFileRenameOperations"; static void process_pending_renames(HKEY hkey) { char *buf, *src, *dst, *buf2, *buf2ptr; - DWORD size, buf2len = 0; + DWORD size; LONG ret; BOOL found = FALSE; ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size); - buf = HeapAlloc(GetProcessHeap(), 0, size); - buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - buf[0] = 0; + buf = HeapAlloc(GetProcessHeap(), 0, size + 1); + buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1); ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size); - ok(!ret, "RegQueryValueExA failed %d (%u)\n", ret, GetLastError()); + buf[size] = 0; + ok(!ret, "RegQueryValueExA failed %d\n", ret); + if (ret) return; for (src = buf; *src; src = dst + strlen(dst) + 1) { @@ -9016,16 +9017,13 @@ static void process_pending_renames(HKEY hkey) if (!strstr(src, "msitest")) { lstrcpyA(buf2ptr, src); - buf2len += strlen(src) + 1; buf2ptr += strlen(src) + 1; if (*dst) { lstrcpyA(buf2ptr, dst); buf2ptr += strlen(dst) + 1; - buf2len += strlen(dst) + 1; } buf2ptr++; - buf2len++; continue; } @@ -9049,10 +9047,7 @@ static void process_pending_renames(HKEY hkey) ok(found, "Expected a 'msitest' entry\n"); if (*buf2) - { - buf2len++; - RegSetValueExA(hkey, rename_ops, 0, REG_MULTI_SZ, (LPBYTE)buf2, buf2len); - } + RegSetValueExA(hkey, rename_ops, 0, REG_MULTI_SZ, (LPBYTE)buf2, buf2ptr + 1 - buf2); else RegDeleteValueA(hkey, rename_ops);

1 0

Henri Verbeet : wined3d: Pass gl_info and state parameters directly to drawStridedSlowVs().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 132158cbf5f435466f059bbe3910a04d2a45757f URL: http://source.winehq.org/git/wine.git/?a=commit;h=132158cbf5f435466f059bbe3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:30 2010 +0200 wined3d: Pass gl_info and state parameters directly to drawStridedSlowVs(). --- dlls/wined3d/drawprim.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f99239d..2441e4c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -411,17 +411,15 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, } /* GL locking is done by the caller */ -static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream_info *si, UINT numberOfVertices, - GLenum glPrimitiveType, const void *idxData, UINT idxSize, UINT startIdx) +static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, + const void *idxData, UINT idxSize, UINT startIdx) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - LONG SkipnStrides = startIdx + This->stateBlock->state.load_base_vertex_index; + LONG SkipnStrides = startIdx + state->load_base_vertex_index; const DWORD *pIdxBufL = NULL; const WORD *pIdxBufS = NULL; UINT vx_index; int i; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; const BYTE *ptr; if (idxSize) @@ -431,7 +429,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream * supported or other reason), or with user pointer drawing idxData * will be non-NULL. */ if (!idxData) - idxData = buffer_get_sysmem(This->stateBlock->state.index_buffer, gl_info); + idxData = buffer_get_sysmem(state->index_buffer, gl_info); if (idxSize == 2) pIdxBufS = idxData; else pIdxBufL = idxData; @@ -449,18 +447,17 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream { /* Indexed so work out the number of strides to skip */ if (idxSize == 2) - SkipnStrides = pIdxBufS[startIdx + vx_index] + stateblock->state.load_base_vertex_index; + SkipnStrides = pIdxBufS[startIdx + vx_index] + state->load_base_vertex_index; else - SkipnStrides = pIdxBufL[startIdx + vx_index] + stateblock->state.load_base_vertex_index; + SkipnStrides = pIdxBufL[startIdx + vx_index] + state->load_base_vertex_index; } for (i = MAX_ATTRIBS - 1; i >= 0; i--) { if (!(si->use_map & (1 << i))) continue; - ptr = si->elements[i].data - + si->elements[i].stride * SkipnStrides - + stateblock->state.streams[si->elements[i].stream_idx].offset; + ptr = si->elements[i].data + si->elements[i].stride * SkipnStrides + + state->streams[si->elements[i].stream_idx].offset; send_attribute(gl_info, si->elements[i].format->id, i, ptr); } @@ -707,8 +704,11 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT } else { TRACE("Using immediate mode with vertex shaders for half float emulation\n"); } - drawStridedSlowVs(iface, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); - } else { + drawStridedSlowVs(context->gl_info, state, stream_info, + index_count, glPrimType, idxData, idxSize, StartIdx); + } + else + { drawStridedSlow(iface, context, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); }

1 0

Henri Verbeet : wined3d: Remove the useless device parameter to drawStridedFast().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: f065a5e54b862fc7038bb7cea855f15ad6996bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f065a5e54b862fc7038bb7cea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:29 2010 +0200 wined3d: Remove the useless device parameter to drawStridedFast(). --- dlls/wined3d/drawprim.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index cc3cf40..f99239d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -33,13 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); #include <math.h> /* GL locking is done by the caller */ -static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type, - UINT count, UINT idx_size, const void *idx_data, UINT start_idx) +static void drawStridedFast(GLenum primitive_type, UINT count, UINT idx_size, const void *idx_data, UINT start_idx) { if (idx_size) { - TRACE("(%p) : glElements(%x, %d, ...)\n", iface, primitive_type, count); - glDrawElements(primitive_type, count, idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (const char *)idx_data + (idx_size * start_idx)); @@ -47,8 +44,6 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type, } else { - TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", iface, primitive_type, start_idx, count); - glDrawArrays(primitive_type, start_idx, count); checkGLcall("glDrawArrays"); } @@ -722,7 +717,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT drawStridedInstanced(iface, &This->strided_streams, index_count, glPrimType, idxData, idxSize, StartIdx); } else { - drawStridedFast(iface, glPrimType, index_count, idxSize, idxData, StartIdx); + drawStridedFast(glPrimType, index_count, idxSize, idxData, StartIdx); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_gl_info structure to send_attribute ().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: c2363f750b90467b1797cf78438e421fd55d1a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2363f750b90467b1797cf784… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:28 2010 +0200 wined3d: Pass a wined3d_gl_info structure to send_attribute(). --- dlls/wined3d/drawprim.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2e032c3..cc3cf40 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -306,11 +306,9 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context } /* GL locking is done by the caller */ -static inline void send_attribute(IWineD3DDeviceImpl *This, +static inline void send_attribute(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format, const UINT index, const void *ptr) { - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - switch(format) { case WINED3DFMT_R32_FLOAT: @@ -469,7 +467,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream + si->elements[i].stride * SkipnStrides + stateblock->state.streams[si->elements[i].stream_idx].offset; - send_attribute(This, si->elements[i].format->id, i, ptr); + send_attribute(gl_info, si->elements[i].format->id, i, ptr); } SkipnStrides++; } @@ -486,6 +484,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; IWineD3DStateBlockImpl *stateblock = This->stateBlock; if (!idxSize) @@ -542,7 +541,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine ptr += (ULONG_PTR)buffer_get_sysmem(vb, &This->adapter->gl_info); } - send_attribute(This, si->elements[instancedData[j]].format->id, instancedData[j], ptr); + send_attribute(gl_info, si->elements[instancedData[j]].format->id, instancedData[j], ptr); } glDrawElements(glPrimitiveType, numberOfVertices, idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT,

1 0

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 September 2010