August 2009 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Support loading windows file paths.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: 89c92bee630b9a1e9e98223dc4f5094e67cb411d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c92bee630b9a1e9e98223dc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 10 22:30:51 2009 +1000 msxml3: Support loading windows file paths. --- dlls/msxml3/main.c | 73 ++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 124 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 358a5cb..c31a53a 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -32,6 +32,7 @@ #include "msxml.h" #include "msxml2.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" @@ -39,6 +40,68 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#ifdef HAVE_LIBXML2 + +/* Support for loading xml files from a Wine Windows drive */ +static int wineXmlMatchCallback (char const * filename) +{ + int nRet = 0; + + TRACE("%s\n", filename); + + /* + * We will deal with loading XML files from the file system + * We only care about files that linux cannot find. + * e.g. C:,D: etc + */ + if(isalpha(filename[0]) && filename[1] == ':') + nRet = 1; + + return nRet; +} + +static void *wineXmlOpenCallback (char const * filename) +{ + BSTR sFilename = bstr_from_xmlChar( (xmlChar*)filename); + HANDLE hFile; + + TRACE("%s\n", debugstr_w(sFilename)); + + hFile = CreateFileW(sFilename, GENERIC_READ,FILE_SHARE_READ, NULL, + OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL, NULL); + if(hFile == INVALID_HANDLE_VALUE) hFile = 0; + SysFreeString(sFilename); + return hFile; +} + +static int wineXmlReadCallback(void * context, char * buffer, int len) +{ + DWORD dwBytesRead; + + TRACE("%p %s %d\n", context, buffer, len); + + if ((context == NULL) || (buffer == NULL)) + return(-1); + + if(!ReadFile( context, buffer,len, &dwBytesRead, NULL)) + { + ERR("Failed to read file\n"); + return -1; + } + + TRACE("Read %d\n", dwBytesRead); + + return dwBytesRead; +} + +static int wineXmlFileCloseCallback (void * context) +{ + return CloseHandle(context) ? 0 : -1; +} + +#endif + + HRESULT WINAPI DllCanUnloadNow(void) { FIXME("\n"); @@ -96,6 +159,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) for this thread and as default for new threads */ xmlTreeIndentString = "\t"; xmlThrDefTreeIndentString("\t"); + + /* Register callbacks for loading XML files */ + if(xmlRegisterInputCallbacks(wineXmlMatchCallback, wineXmlOpenCallback, + wineXmlReadCallback, wineXmlFileCloseCallback) == -1) + WARN("Failed to register callbacks\n"); + #endif init_libxslt(); DisableThreadLibraryCalls(hInstDLL); @@ -110,6 +179,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } #endif #ifdef HAVE_LIBXML2 + /* Restore default Callbacks */ + xmlCleanupInputCallbacks(); + xmlRegisterDefaultInputCallbacks(); + xmlCleanupParser(); #endif release_typelib(); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0eddb38..2d831dd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -150,6 +150,37 @@ static const CHAR szTypeValueXML[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" "<string>Wine</string>"; +static const CHAR szBasicTransformSSXMLPart1[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"html\"/>\n" +"<xsl:template match=\"/\">" +"<HTML><BODY><TABLE>" +" <xsl:apply-templates select='document(\""; + +static const CHAR szBasicTransformSSXMLPart2[] = +"\")/bottle/wine'>" +" <xsl:sort select=\"cost\"/><xsl:sort select=\"name\"/>" +" </xsl:apply-templates>" +"</TABLE></BODY></HTML>" +"</xsl:template>" +"<xsl:template match=\"bottle\">" +" <TR><xsl:apply-templates select=\"name\" /><xsl:apply-templates select=\"cost\" /></TR>" +"</xsl:template>" +"<xsl:template match=\"name\">" +" <TD><xsl:apply-templates /></TD>" +"</xsl:template>" +"<xsl:template match=\"cost\">" +" <TD><xsl:apply-templates /></TD>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static const CHAR szBasicTransformXML[] = +"<?xml version=\"1.0\"?><bottle><wine><name>Wine</name><cost>$25.00</cost></wine></bottle>"; + +static const CHAR szBasicTransformOutput[] = +"<HTML><BODY><TABLE><TD>Wine</TD><TD>$25.00</TD></TABLE></BODY></HTML>"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -3952,6 +3983,98 @@ static void test_NodeTypeValue(void) free_bstrs(); } +static void test_TransformWithLoadingLocalFile(void) +{ + IXMLDOMDocument2 *doc = NULL; + IXMLDOMDocument2 *xsl = NULL; + IXMLDOMNode *pNode; + VARIANT_BOOL bSucc; + HRESULT hr; + HANDLE file; + DWORD dwWritten; + char lpPathBuffer[MAX_PATH]; + int i; + + /* Create a Temp File. */ + GetTempPathA(MAX_PATH, lpPathBuffer); + strcat(lpPathBuffer, "customers.xml" ); + + file = CreateFile(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + if(file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, szBasicTransformXML, strlen(szBasicTransformXML), &dwWritten, NULL); + CloseHandle(file); + + /* Correct path to not include a escape character. */ + for(i=0; i < strlen(lpPathBuffer); i++) + { + if(lpPathBuffer[i] == '\\') + lpPathBuffer[i] = '/'; + } + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&xsl ); + if( hr != S_OK ) + { + IXMLDOMDocument2_Release(doc); + return; + } + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szTypeValueXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + if(bSucc == VARIANT_TRUE) + { + BSTR sXSL; + BSTR sPart1 = _bstr_(szBasicTransformSSXMLPart1); + BSTR sPart2 = _bstr_(szBasicTransformSSXMLPart2); + BSTR sFileName = _bstr_(lpPathBuffer); + int nLegnth = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; + + sXSL = SysAllocStringLen(NULL, nLegnth); + lstrcpyW(sXSL, sPart1); + lstrcatW(sXSL, sFileName); + lstrcatW(sXSL, sPart2); + + hr = IXMLDOMDocument2_loadXML(xsl, sXSL, &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + if(bSucc == VARIANT_TRUE) + { + BSTR sResult; + + hr = IXMLDOMDocument_QueryInterface(xsl, &IID_IXMLDOMNode, (LPVOID*)&pNode ); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + /* This will load the temp file via the XSL */ + hr = IXMLDOMDocument2_transformNode(doc, pNode, &sResult); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + ok( compareIgnoreReturns( sResult, _bstr_(szBasicTransformOutput)), "Stylesheet output not correct\n"); + SysFreeString(sResult); + } + + IXMLDOMNode_Release(pNode); + } + } + + SysFreeString(sXSL); + } + + IXMLDOMDocument2_Release(doc); + IXMLDOMDocument2_Release(xsl); + + DeleteFile(lpPathBuffer); + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3981,6 +4104,7 @@ START_TEST(domdoc) test_Namespaces(); test_FormattingXML(); test_NodeTypeValue(); + test_TransformWithLoadingLocalFile(); CoUninitialize(); }

1 0

Henri Verbeet : wined3d: Hide WINED3DFMT_R16G16B16A16_UNORM again.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: c70f3816abebe7bf0cd5d4704fc167504c435137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70f3816abebe7bf0cd5d4704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 19 10:55:39 2009 +0200 wined3d: Hide WINED3DFMT_R16G16B16A16_UNORM again. This format is broken on some cards. Hide it until we figure out a reliable way to deal with it. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 56c9507..23a3723 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2860,7 +2860,6 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, case WINED3DFMT_A2R10G10B10: case WINED3DFMT_R10G10B10A2_UNORM: case WINED3DFMT_R16G16_UNORM: - case WINED3DFMT_R16G16B16A16_UNORM: TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -2973,6 +2972,7 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, return FALSE; /* Not supported */ + case WINED3DFMT_R16G16B16A16_UNORM: case WINED3DFMT_A8R3G3B2: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE;

1 0

Henri Verbeet : wined3d: Pass the context's gl_info to state handlers.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: 5a24a02ad5d4cd40f6c1c1edc63ee81f4edef609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a24a02ad5d4cd40f6c1c1edc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 19 10:55:38 2009 +0200 wined3d: Pass the context's gl_info to state handlers. --- dlls/wined3d/state.c | 47 ++++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b2f58c8..7ea91b0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION stateblock->wineD3DDevice->adapter->gl_info +#define GLINFO_LOCATION (*context->gl_info) /* GL locking for state handlers is done by the caller. */ @@ -775,8 +775,9 @@ static void state_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, str } } -static void -renderstate_stencil_twosided(IWineD3DStateBlockImpl *stateblock, GLint face, GLint func, GLint ref, GLuint mask, GLint stencilFail, GLint depthFail, GLint stencilPass ) { +static void renderstate_stencil_twosided(struct wined3d_context *context, GLint face, + GLint func, GLint ref, GLuint mask, GLint stencilFail, GLint depthFail, GLint stencilPass) +{ glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); GL_EXTCALL(glActiveStencilFaceEXT(face)); @@ -842,10 +843,10 @@ static void state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, struc * and other stencil functions which do not use two sided stencil do not have * to set it back */ - renderstate_stencil_twosided(stateblock, GL_BACK, func_ccw, ref, mask, - stencilFail_ccw, depthFail_ccw, stencilPass_ccw); - renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, - stencilFail, depthFail, stencilPass); + renderstate_stencil_twosided(context, GL_BACK, + func_ccw, ref, mask, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); + renderstate_stencil_twosided(context, GL_FRONT, + func, ref, mask, stencilFail, depthFail, stencilPass); } else if(GL_SUPPORT(ATI_SEPARATE_STENCIL)) { GL_EXTCALL(glStencilFuncSeparateATI(func, func_ccw, ref, mask)); checkGLcall("glStencilFuncSeparateATI(...)"); @@ -1889,7 +1890,8 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op } /* Setup the texture operations texture stage states */ -static void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) +static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *iface, + BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { GLenum src1, src2, src3; GLenum opr1, opr2, opr3; @@ -1900,7 +1902,6 @@ static void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTE GLenum opr=0, invopr, src3_target, opr3_target; BOOL Handled = FALSE; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; /* for GLINFO_LOCATION */ TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%d), a2(%d), a3(%d)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3); @@ -2966,7 +2967,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if (tex_used) texture_activate_dimensions(stage, stateblock, context); } - set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, FALSE, stage, + set_tex_op(context, (IWineD3DDevice *)stateblock->wineD3DDevice, FALSE, stage, stateblock->textureState[stage][WINED3DTSS_COLOROP], stateblock->textureState[stage][WINED3DTSS_COLORARG1], stateblock->textureState[stage][WINED3DTSS_COLORARG2], @@ -3068,7 +3069,7 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d mapped_stage, stateblock->textureState[stage][WINED3DTSS_RESULTARG]); } else { - set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, + set_tex_op(context, (IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, op, arg1, arg2, arg0); } } @@ -3119,7 +3120,8 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, s } } -static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { +static void unloadTexCoords(const struct wined3d_context *context) +{ unsigned int texture_idx; for (texture_idx = 0; texture_idx < GL_LIMITS(texture_stages); ++texture_idx) { @@ -3128,7 +3130,8 @@ static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { } } -static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, const struct wined3d_stream_info *si, GLuint *curVBO) +static void loadTexCoords(const struct wined3d_context *context, IWineD3DStateBlockImpl *stateblock, + const struct wined3d_stream_info *si, GLuint *curVBO) { const UINT *offset = stateblock->streamOffset; unsigned int mapped_stage = 0; @@ -3344,8 +3347,8 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, stru */ GLuint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? ~0U : 0; - unloadTexCoords(stateblock); - loadTexCoords(stateblock, &stateblock->wineD3DDevice->strided_streams, &curVBO); + unloadTexCoords(context); + loadTexCoords(context, stateblock, &stateblock->wineD3DDevice->strided_streams, &curVBO); } } @@ -3911,7 +3914,8 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * stateblock impl is required for GL_SUPPORT * TODO: Only load / unload arrays if we have to. */ -static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { +static inline void unloadVertexData(const struct wined3d_context *context) +{ glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_COLOR_ARRAY); @@ -3921,7 +3925,7 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { if (GL_SUPPORT(ARB_VERTEX_BLEND)) { glDisableClientState(GL_WEIGHT_ARRAY_ARB); } - unloadTexCoords(stateblock); + unloadTexCoords(context); } static inline void unload_numbered_array(IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context, int i) @@ -4126,7 +4130,8 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, } /* Used from 2 different functions, and too big to justify making it inlined */ -static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const struct wined3d_stream_info *si) +static void loadVertexData(const struct wined3d_context *context, IWineD3DStateBlockImpl *stateblock, + const struct wined3d_stream_info *si) { const UINT *offset = stateblock->streamOffset; GLuint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? ~0U : 0; @@ -4357,7 +4362,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const struct wine } /* Texture coords -------------------------------------------*/ - loadTexCoords(stateblock, si, &curVBO); + loadTexCoords(context, stateblock, si, &curVBO); } static inline void drawPrimitiveTraceDataLocations(const struct wined3d_stream_info *dataLocations) @@ -4445,7 +4450,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi } else if (context->namedArraysLoaded) { - unloadVertexData(stateblock); + unloadVertexData(context); context->namedArraysLoaded = FALSE; } @@ -4458,7 +4463,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi else if (load_named) { TRACE("Loading vertex data\n"); - loadVertexData(stateblock, dataLocations); + loadVertexData(context, stateblock, dataLocations); context->namedArraysLoaded = TRUE; } }

1 0

Henri Verbeet : wined3d: Rename some GLSL instruction handlers.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: dc8b1bdc0f0999db83b591723a18562112dad651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8b1bdc0f0999db83b591723… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 19 10:55:37 2009 +0200 wined3d: Rename some GLSL instruction handlers. The pshader_glsl_* names are a leftover from when we had separate code for vertex and fragment shaders. --- dlls/wined3d/glsl_shader.c | 88 ++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc8b1bdc0f0999db83b59…

1 0

Henri Verbeet : wined3d: Try to force a top-left filling convention.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: ffb38da024b044b4958d21784b5cc290291883a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb38da024b044b4958d21784… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 19 10:55:36 2009 +0200 wined3d: Try to force a top-left filling convention. --- dlls/d3d9/tests/visual.c | 6 +++--- dlls/wined3d/state.c | 33 +++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ce53ca9..48fea06 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8526,7 +8526,7 @@ static void pointsize_test(IDirect3DDevice9 *device) color = getPixelColor(device, 64-9, 64-9); ok(color == 0x000000ff, "pSize: Pixel (64-9),(64-9) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 64-8, 64-8); - todo_wine ok(color == 0x00ffffff, "pSize: Pixel (64-8),(64-8) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff, "pSize: Pixel (64-8),(64-8) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 64-7, 64-7); ok(color == 0x00ffffff, "pSize: Pixel (64-7),(64-7) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 64+7, 64+7); @@ -8539,7 +8539,7 @@ static void pointsize_test(IDirect3DDevice9 *device) color = getPixelColor(device, 128-17, 64-17); ok(color == 0x000000ff, "pSize: Pixel (128-17),(64-17) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 128-16, 64-16); - todo_wine ok(color == 0x00ffffff, "pSize: Pixel (128-16),(64-16) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff, "pSize: Pixel (128-16),(64-16) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 128-15, 64-15); ok(color == 0x00ffffff, "pSize: Pixel (128-15),(64-15) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 128+15, 64+15); @@ -8552,7 +8552,7 @@ static void pointsize_test(IDirect3DDevice9 *device) color = getPixelColor(device, 192-17, 64-17); ok(color == 0x000000ff, "pSize: Pixel (192-17),(64-17) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 192-16, 64-16); - ok(color == 0x000000ff, "pSize: Pixel (192-16),(64-16) has color 0x%08x, expected 0x000000ff\n", color); + todo_wine ok(color == 0x000000ff, "pSize: Pixel (192-16),(64-16) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 192-15, 64-15); ok(color == 0x00ffffff, "pSize: Pixel (192-15),(64-15) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 192+15, 64+15); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1448b24..b2f58c8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3833,8 +3833,9 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock checkGLcall("glOrtho"); /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ - glTranslatef(0.5f, 0.5f, 0.0f); - checkGLcall("glTranslatef(0.5f, 0.5f, 0.0f)"); + glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f); + checkGLcall("glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f)"); + /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (context->render_offscreen) @@ -3880,16 +3881,23 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * glScalef(1.0, flip, 2.0); */ + /* Translate by slightly less than a half pixel to force a top-left + * filling convention. We want the difference to be large enough that + * it doesn't get lost due to rounding inside the driver, but small + * enough to prevent it from interfering with any anti-aliasing. */ + GLfloat xoffset = (63.0f / 64.0f) / stateblock->viewport.Width; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + if (context->render_offscreen) { /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ - glTranslatef(1.0f / stateblock->viewport.Width, 1.0f / stateblock->viewport.Height, -1.0f); - checkGLcall("glTranslatef(1.0f / width, 1.0f / height, -1.0f)"); + glTranslatef(xoffset, -yoffset, -1.0f); + checkGLcall("glTranslatef(xoffset, -yoffset, -1.0f)"); glScalef(1.0f, -1.0f, 2.0f); } else { - glTranslatef(1.0f / stateblock->viewport.Width, -1.0f / stateblock->viewport.Height, -1.0f); - checkGLcall("glTranslatef(1.0f / width, -1.0f / height, -1.0f)"); + glTranslatef(xoffset, yoffset, -1.0f); + checkGLcall("glTranslatef(xoffset, yoffset, -1.0f)"); glScalef(1.0f, 1.0f, 2.0f); } checkGLcall("glScalef"); @@ -4492,9 +4500,11 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, s /* This sets the shader output position correction constants. * TODO: Move to the viewport state */ - if (useVertexShaderFunction) { + if (useVertexShaderFunction) + { + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; device->posFixup[1] = context->render_offscreen ? -1.0f : 1.0f; - device->posFixup[3] = -device->posFixup[1] / stateblock->viewport.Height; + device->posFixup[3] = device->posFixup[1] * yoffset; } } @@ -4639,8 +4649,11 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - stateblock->wineD3DDevice->posFixup[2] = 1.0f / stateblock->viewport.Width; - stateblock->wineD3DDevice->posFixup[3] = -stateblock->wineD3DDevice->posFixup[1] / stateblock->viewport.Height; + GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height; + + stateblock->wineD3DDevice->posFixup[2] = (63.0f / 64.0f) / stateblock->viewport.Width; + stateblock->wineD3DDevice->posFixup[3] = stateblock->wineD3DDevice->posFixup[1] * yoffset; + if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); }

1 0

Henri Verbeet : wined3d: Make use_vs() safe to call from IWineD3DDeviceImpl_FindTexUnitMap().
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: 92b66ac82cced7170821bd8d5abff5083b451bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b66ac82cced7170821bd8d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 19 10:55:35 2009 +0200 wined3d: Make use_vs() safe to call from IWineD3DDeviceImpl_FindTexUnitMap(). --- dlls/wined3d/wined3d_private.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 514c9a9..44bb10e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2885,8 +2885,12 @@ const struct GlPixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt, const stru static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) { + /* Check stateblock->vertexDecl to allow this to be used from + * IWineD3DDeviceImpl_FindTexUnitMap(). This is safe because + * stateblock->vertexShader implies a vertex declaration instead of ddraw + * style strided data. */ return (stateblock->vertexShader - && !stateblock->wineD3DDevice->strided_streams.position_transformed + && !((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->position_transformed && stateblock->wineD3DDevice->vs_selected_mode != SHADER_NONE); }

1 0

Jesse Litton : dbghelp: Don't double memory allocation on every add.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: 43a35958f698871ff01573b61030d80d0097e008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a35958f698871ff01573b61… Author: Jesse Litton <wine(a)eternaldusk.com> Date: Sat Aug 15 09:31:50 2009 -0500 dbghelp: Don't double memory allocation on every add. --- dlls/dbghelp/minidump.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 4108ef4..a2f1633 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -260,7 +260,7 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, dc->modules = HeapAlloc(GetProcessHeap(), 0, dc->alloc_modules * sizeof(*dc->modules)); } - else + else if(dc->num_modules >= dc->alloc_modules) { dc->alloc_modules *= 2; dc->modules = HeapReAlloc(GetProcessHeap(), 0, dc->modules, @@ -394,17 +394,17 @@ static void fetch_module_versioninfo(LPCWSTR filename, VS_FIXEDFILEINFO* ffi) */ static void add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva) { - if (dc->mem) + if (!dc->mem) + { + dc->alloc_mem = 32; + dc->mem = HeapAlloc(GetProcessHeap(), 0, dc->alloc_mem * sizeof(*dc->mem)); + } + else if (dc->num_mem >= dc->alloc_mem) { dc->alloc_mem *= 2; dc->mem = HeapReAlloc(GetProcessHeap(), 0, dc->mem, dc->alloc_mem * sizeof(*dc->mem)); } - else - { - dc->alloc_mem = 32; - dc->mem = HeapAlloc(GetProcessHeap(), 0, dc->alloc_mem * sizeof(*dc->mem)); - } if (dc->mem) { dc->mem[dc->num_mem].base = base;

1 0

Rico Schüller : wined3d: Fix some checkGLcalls.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: d9784c1a2f19c5aba0a02ba142e1b440b752450d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9784c1a2f19c5aba0a02ba14… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 15 15:59:55 2009 +0200 wined3d: Fix some checkGLcalls. --- dlls/wined3d/surface.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 865cbc7..82612a3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -369,7 +369,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); checkGLcall("glBindBufferARB"); GL_EXTCALL(glGetCompressedTexImageARB(This->texture_target, This->texture_level, NULL)); - checkGLcall("glGetCompressedTexImageARB()"); + checkGLcall("glGetCompressedTexImageARB"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); } @@ -377,7 +377,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { { GL_EXTCALL(glGetCompressedTexImageARB(This->texture_target, This->texture_level, This->resource.allocatedMemory)); - checkGLcall("glGetCompressedTexImageARB()"); + checkGLcall("glGetCompressedTexImageARB"); } LEAVE_GL(); @@ -413,13 +413,13 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { checkGLcall("glBindBufferARB"); glGetTexImage(This->texture_target, This->texture_level, format, type, NULL); - checkGLcall("glGetTexImage()"); + checkGLcall("glGetTexImage"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); } else { glGetTexImage(This->texture_target, This->texture_level, format, type, mem); - checkGLcall("glGetTexImage()"); + checkGLcall("glGetTexImage"); } LEAVE_GL(); @@ -797,11 +797,11 @@ static void surface_remove_pbo(IWineD3DSurfaceImpl *This) { ENTER_GL(); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBuffer(GL_PIXEL_UNPACK_BUFFER, This->pbo)"); + checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, This->pbo)"); GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, This->resource.size, This->resource.allocatedMemory)); - checkGLcall("glGetBufferSubData"); + checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); - checkGLcall("glDeleteBuffers"); + checkGLcall("glDeleteBuffersARB"); LEAVE_GL(); This->pbo = 0; @@ -1002,11 +1002,11 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v /* Save old pixel store pack state */ glGetIntegerv(GL_PACK_ROW_LENGTH, &rowLen); - checkGLcall("glIntegerv"); + checkGLcall("glGetIntegerv"); glGetIntegerv(GL_PACK_SKIP_PIXELS, &skipPix); - checkGLcall("glIntegerv"); + checkGLcall("glGetIntegerv"); glGetIntegerv(GL_PACK_SKIP_ROWS, &skipRow); - checkGLcall("glIntegerv"); + checkGLcall("glGetIntegerv"); /* Setup pixel store pack state -- to glReadPixels into the correct place */ glPixelStorei(GL_PACK_ROW_LENGTH, This->currentDesc.Width); @@ -1385,9 +1385,9 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm } glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); - checkGLcall("glIntegerv"); + checkGLcall("glGetIntegerv"); glGetIntegerv(GL_CURRENT_RASTER_POSITION, &prev_rasterpos[0]); - checkGLcall("glIntegerv"); + checkGLcall("glGetIntegerv"); glPixelZoom(1.0f, -1.0f); checkGLcall("glPixelZoom"); @@ -1396,7 +1396,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); - checkGLcall("glRasterPos2f"); + checkGLcall("glRasterPos3i"); /* Some drivers(radeon dri, others?) don't like exceptions during * glDrawPixels. If the surface is a DIB section, it might be in GDIMode @@ -1446,7 +1446,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm /* Reset to previous pack row length */ glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes); - checkGLcall("glPixelStorei GL_UNPACK_ROW_LENGTH"); + checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH)"); if(!swapchain) { glDrawBuffer(myDevice->offscreenBuffer); @@ -2730,7 +2730,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, c ENTER_GL(); FIXME("Saving texture level %d width %d height %d\n", This->texture_level, width, height); glGetTexImage(GL_TEXTURE_2D, This->texture_level, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, allocatedMemory); - checkGLcall("glTexImage2D"); + checkGLcall("glGetTexImage"); if (tmpTexture) { glBindTexture(GL_TEXTURE_2D, 0); glDeleteTextures(1, &tmpTexture); @@ -3756,7 +3756,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* This is for color keying */ if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable GL_ALPHA_TEST"); + checkGLcall("glEnable(GL_ALPHA_TEST)"); /* When the primary render target uses P8, the alpha component contains the palette index. * Which means that the colorkey is one of the palette entries. In other cases pixels that @@ -3768,7 +3768,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const checkGLcall("glAlphaFunc"); } else { glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable GL_ALPHA_TEST"); + checkGLcall("glDisable(GL_ALPHA_TEST)"); } /* Draw a textured quad @@ -4642,7 +4642,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT glEnable(bind_target); checkGLcall("glEnable(bind_target)"); glBindTexture(bind_target, This->texture_name); - checkGLcall("bind_target, This->texture_name)"); + checkGLcall("glBindTexture(bind_target, This->texture_name)"); glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

1 0

Alexandre Julliard : winhttp/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: f07ac99d9e2cadaa7eeafdfc0b2f6cfd234e6b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07ac99d9e2cadaa7eeafdfc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:37:09 2009 +0200 winhttp/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/winhttp/tests/url.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 14b20c1..b77520d 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -90,13 +90,6 @@ static const WCHAR url_k9[] = static const WCHAR url_k10[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','/','p','o','s','t',';','a',0}; -static const char *debugstr_w(LPCWSTR str) -{ - static char buf[1024]; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); - return buf; -} - static void fill_url_components( URL_COMPONENTS *uc ) { uc->dwStructSize = sizeof(URL_COMPONENTS); @@ -537,7 +530,7 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url7, 0, 0, &uc ); ok( ret, "WinHttpCrackUrl failed\n" ); - ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", debugstr_w(uc.lpszHostName) ); + ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", wine_dbgstr_w(uc.lpszHostName) ); ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort );

1 0

Alexandre Julliard : urlmon/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard 19 Aug '09

19 Aug '09

Module: wine Branch: master Commit: 203bf6c8e051fe62ed7368e3e01865b747a4395e URL: http://source.winehq.org/git/wine.git/?a=commit;h=203bf6c8e051fe62ed7368e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:37:04 2009 +0200 urlmon/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/urlmon/tests/misc.c | 13 +++---------- dlls/urlmon/tests/protocol.c | 35 +++++++++++++---------------------- dlls/urlmon/tests/url.c | 23 ++++++++--------------- 3 files changed, 24 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=203bf6c8e051fe62ed736…

1 0