November 2011 - Wine-commits

Henri Verbeet : wined3d: Construct the non-rhw projection matrix directly in transform_projection() .
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 27132a30f58e691526447caca94faeafb62396fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=27132a30f58e691526447caca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:20 2011 +0100 wined3d: Construct the non-rhw projection matrix directly in transform_projection(). --- dlls/wined3d/state.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 21797d5..cd03647 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3930,39 +3930,21 @@ static void transform_projection(struct wined3d_context *context, const struct w } else { - /* - * Careful with the order of operations here, we're essentially working backwards: - * x = x + 1/w; - * y = (y - 1/h) * flip; - * z = z * 2 - 1; - * - * Becomes: - * glTranslatef(0.0, 0.0, -1.0); - * glScalef(1.0, 1.0, 2.0); - * - * glScalef(1.0, flip, 1.0); - * glTranslatef(1/w, -1/h, 0.0); - * - * This is equivalent to: - * glTranslatef(1/w, -flip/h, -1.0) - * glScalef(1.0, flip, 2.0); - */ - GLfloat xoffset = (63.0f / 64.0f) / state->viewport.Width; - GLfloat yoffset = -(63.0f / 64.0f) / state->viewport.Height; - - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - if (context->render_offscreen) + double y_scale = context->render_offscreen ? -1.0 : 1.0; + double x_offset = (63.0 / 64.0) / state->viewport.Width; + double y_offset = context->render_offscreen + ? (63.0 / 64.0) / state->viewport.Height + : -(63.0 / 64.0) / state->viewport.Height; + const GLdouble projection[] = { - glTranslatef(xoffset, -yoffset, -1.0f); - checkGLcall("glTranslatef(xoffset, -yoffset, -1.0f)"); - glScalef(1.0f, -1.0f, 2.0f); - } else { - glTranslatef(xoffset, yoffset, -1.0f); - checkGLcall("glTranslatef(xoffset, yoffset, -1.0f)"); - glScalef(1.0f, 1.0f, 2.0f); - } - checkGLcall("glScalef"); + 1.0, 0.0, 0.0, 0.0, + 0.0, y_scale, 0.0, 0.0, + 0.0, 0.0, 2.0, 0.0, + x_offset, y_offset, -1.0, 1.0, + }; + + glLoadMatrixd(projection); + checkGLcall("glLoadMatrixd"); glMultMatrixf(&state->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf");

1 0

Henri Verbeet : wined3d: Make the buffer parameter to buffer_sanitize_flags () const.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 117af3a2b14732440e7e4d8d025df4212e3e4e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117af3a2b14732440e7e4d8d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:21 2011 +0100 wined3d: Make the buffer parameter to buffer_sanitize_flags() const. --- dlls/wined3d/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c896394..a4c64fe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -934,7 +934,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) context_release(context); } -static DWORD buffer_sanitize_flags(struct wined3d_buffer *buffer, DWORD flags) +static DWORD buffer_sanitize_flags(const struct wined3d_buffer *buffer, DWORD flags) { /* Not all flags make sense together, but Windows never returns an error. Catch the * cases that could cause issues */

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_load_constantsF() const.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 78bd84cc120531527bea2b389397aced49889ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bd84cc120531527bea2b389… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 1 20:15:22 2011 +0100 wined3d: Make the shader parameter to shader_arb_load_constantsF() const. --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b26313..8fd0714 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -365,8 +365,9 @@ static unsigned int reserved_vs_const(const struct arb_vshader_private *shader_d * or GL_FRAGMENT_PROGRAM_ARB (for pixel shaders) */ /* GL locking is done by the caller */ -static unsigned int shader_arb_load_constantsF(struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - GLuint target_type, unsigned int max_constants, const float *constants, char *dirty_consts) +static unsigned int shader_arb_load_constantsF(const struct wined3d_shader *shader, + const struct wined3d_gl_info *gl_info, GLuint target_type, unsigned int max_constants, + const float *constants, char *dirty_consts) { struct wined3d_shader_lconst *lconst; DWORD i, j;

1 0

Aric Stewart : user32: Only attempt autoscroll line breaking on an edit control when we have a reasonable width to break to .
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 5e3272421026aa928f76751d022ade5914810a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3272421026aa928f76751d0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 1 14:48:35 2011 -0500 user32: Only attempt autoscroll line breaking on an edit control when we have a reasonable width to break to. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a0bc962..7971333 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -600,7 +600,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta /* Line breaks just look back from the end and find the next break and try that. */ if (!(es->style & ES_AUTOHSCROLL)) { - if (current_line->width > fw) { + if (current_line->width > fw && fw > es->char_width) { INT prev, next; int w;

1 0

Nikolay Sivov : msxml3: Support IDispatchEx for IXMLDOMParseError.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 7a62e46fa153aac9ad544e30fd29d3ed29a9aae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a62e46fa153aac9ad544e30f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 23:50:56 2011 +0300 msxml3: Support IDispatchEx for IXMLDOMParseError. --- dlls/msxml3/parseerror.c | 20 ++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 9 +++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 8e67816..b8cc381 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct { + DispatchEx dispex; IXMLDOMParseError IXMLDOMParseError_iface; LONG ref; LONG code, line, linepos, filepos; @@ -70,6 +71,10 @@ static HRESULT WINAPI parseError_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -103,6 +108,7 @@ static ULONG WINAPI parseError_Release( SysFreeString(This->url); SysFreeString(This->reason); SysFreeString(This->srcText); + release_dispex(&This->dispex); heap_free( This ); } @@ -289,6 +295,18 @@ static const struct IXMLDOMParseErrorVtbl parseError_vtbl = parseError_get_filepos }; +static const tid_t parseError_iface_tids[] = { + IXMLDOMParseError_tid, + 0 +}; + +static dispex_static_data_t parseError_dispex = { + NULL, + IXMLDOMParseError_tid, + NULL, + parseError_iface_tids +}; + IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) { @@ -309,5 +327,7 @@ IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR src This->linepos = linepos; This->filepos = filepos; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMParseError_iface, &parseError_dispex); + return &This->IXMLDOMParseError_iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 41fb835..e1be912 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10627,6 +10627,7 @@ static void test_dispex(void) { const DOMNodeType *type = dispex_types_test; IXMLDOMNodeList *node_list; + IXMLDOMParseError *error; IXMLDOMDocument *doc; IUnknown *unk; HRESULT hr; @@ -10663,6 +10664,14 @@ static void test_dispex(void) IUnknown_Release(unk); IXMLDOMNodeList_Release(node_list); + /* IXMLDOMParseError */ + hr = IXMLDOMDocument_get_parseError(doc, &error); + EXPECT_HR(hr, S_OK); + IXMLDOMParseError_QueryInterface(error, &IID_IUnknown, (void**)&unk); + test_domobj_dispex(unk); + IUnknown_Release(unk); + IXMLDOMParseError_Release(error); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Silence IDispatchJS query.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: cf5a68e9bd7af8a596f0b4ec59bbf25d9b43a107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5a68e9bd7af8a596f0b4ec5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 23:52:32 2011 +0300 msxml3: Silence IDispatchJS query. --- dlls/msxml3/dispex.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 274f604..436c277 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -631,6 +631,8 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { static const IID IID_UndocumentedScriptIface = {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; + static const IID IID_IDispatchJS = + {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); @@ -638,6 +640,9 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; + }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { + TRACE("(%p)->(IID_IDispatchJS %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL;

1 0

Andrew Talbot : rsaenh: Remove unneeded address-of operator from array name .
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 7998cd46290fdc298d87bad1c56f7f7219a695d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7998cd46290fdc298d87bad1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 1 22:51:38 2011 +0000 rsaenh: Remove unneeded address-of operator from array name. --- dlls/rsaenh/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fc04579..fe5ff3a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2546,7 +2546,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY *pCryptKey, BYTE *pbData, pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; *pKeyLen = pCryptKey->dwKeyLen; - memcpy(pbKey, &pCryptKey->abKeyValue, pCryptKey->dwKeyLen); + memcpy(pbKey, pCryptKey->abKeyValue, pCryptKey->dwKeyLen); } *pdwDataLen = dwDataLen; return TRUE;

1 0

Andrew Talbot : shell32: Remove unneeded address-of operators from array names.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: cb84c2dac1f0d78eca0ce9dcd6a88e75a2c3eb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb84c2dac1f0d78eca0ce9dcd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 1 22:51:42 2011 +0000 shell32: Remove unneeded address-of operators from array names. --- dlls/shell32/shv_item_cmenu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 245bbd4..604099c 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -418,8 +418,8 @@ static void DoOpenProperties(ItemCmImpl *This, HWND hwnd) psh.u3.phpage = hpages; psh.u2.nStartPage = 0; - _ILSimpleGetTextW(This->apidl[0], (LPVOID)&wszFilename, MAX_PATH); - psh.pszCaption = (LPCWSTR)&wszFilename; + _ILSimpleGetTextW(This->apidl[0], (LPVOID)wszFilename, MAX_PATH); + psh.pszCaption = (LPCWSTR)wszFilename; /* Find out where to look for the shell extensions */ if (_ILIsValue(This->apidl[0]))

1 0

Alexandre Julliard : wineps: Fix a couple of typos in the path painting function.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 2cf3975dfca3c1fca918ca8c09890d38614ca274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf3975dfca3c1fca918ca8c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 21:10:13 2011 +0100 wineps: Fix a couple of typos in the path painting function. Thanks to Octavian Voicu. --- dlls/wineps.drv/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 3459fe1..41f6e91 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -540,11 +540,11 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) if (!points || !types) goto done; if (GetPath( dev->hdc, points, types, size ) == -1) goto done; - if (fill) PSDRV_SetPen(dev); + if (stroke) PSDRV_SetPen(dev); PSDRV_SetClip(dev); for (i = 0; i < size; i++) { - switch (types[i] & ~PT_CLOSEFIGURE) + switch (types[i]) { case PT_MOVETO: PSDRV_WriteMoveTo( dev, points[i].x, points[i].y );

1 0

Alexandre Julliard : gdi32/tests: Add some tests for palette-relative pattern brushes.
by Alexandre Julliard 02 Nov '11

02 Nov '11

Module: wine Branch: master Commit: 8afcff3c79b0dd37c9d24075b2d93b81d21c4a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afcff3c79b0dd37c9d24075b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 11:33:00 2011 +0100 gdi32/tests: Add some tests for palette-relative pattern brushes. --- dlls/gdi32/tests/brush.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a2767ff..3742608 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -213,8 +213,85 @@ static void test_pattern_brush(void) GlobalFree( mem ); } +static void test_palette_brush(void) +{ + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD) + 16 * 16]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + WORD *indices = (WORD *)info->bmiColors; + char pal_buffer[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; + HDC hdc = CreateCompatibleDC( 0 ); + DWORD *dib_bits; + HBITMAP dib; + HBRUSH brush; + int i; + HPALETTE palette, palette2; + + memset( info, 0, sizeof(*info) ); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = 16; + info->bmiHeader.biHeight = 16; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( NULL, info, DIB_RGB_COLORS, (void**)&dib_bits, NULL, 0 ); + ok( dib != NULL, "CreateDIBSection failed\n" ); + + info->bmiHeader.biBitCount = 8; + for (i = 0; i < 256; i++) indices[i] = 255 - i; + for (i = 0; i < 256; i++) ((BYTE *)(indices + 256))[i] = i; + brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS ); + ok( brush != NULL, "CreateDIBPatternBrushPt failed\n" ); + + pal->palVersion = 0x300; + pal->palNumEntries = 256; + for (i = 0; i < 256; i++) + { + pal->palPalEntry[i].peRed = i * 2; + pal->palPalEntry[i].peGreen = i * 2; + pal->palPalEntry[i].peBlue = i * 2; + pal->palPalEntry[i].peFlags = 0; + } + palette = CreatePalette( pal ); + + ok( SelectObject( hdc, dib ) != NULL, "SelectObject failed\n" ); + ok( SelectPalette( hdc, palette, 0 ) != NULL, "SelectPalette failed\n" ); + ok( SelectObject( hdc, brush ) != NULL, "SelectObject failed\n" ); + memset( dib_bits, 0xaa, 16 * 16 * 4 ); + PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); + for (i = 0; i < 256; i++) + { + DWORD expect = (pal->palPalEntry[255 - i].peRed << 16 | + pal->palPalEntry[255 - i].peGreen << 8 | + pal->palPalEntry[255 - i].peBlue); + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + } + + for (i = 0; i < 256; i++) pal->palPalEntry[i].peRed = i * 3; + palette2 = CreatePalette( pal ); + ok( SelectPalette( hdc, palette2, 0 ) != NULL, "SelectPalette failed\n" ); + memset( dib_bits, 0xaa, 16 * 16 * 4 ); + PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); + for (i = 0; i < 256; i++) + { + DWORD expect = (pal->palPalEntry[255 - i].peRed << 16 | + pal->palPalEntry[255 - i].peGreen << 8 | + pal->palPalEntry[255 - i].peBlue); + if (expect) + todo_wine ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + else + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + } + DeleteDC( hdc ); + DeleteObject( dib ); + DeleteObject( brush ); + DeleteObject( palette ); + DeleteObject( palette2 ); +} + START_TEST(brush) { test_solidbrush(); test_pattern_brush(); + test_palette_brush(); }

1 0