March 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Explicitly set the border pixel when creating the client window.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: f15a5ff70f43b98e0d2af4fd3a3c028c11871688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15a5ff70f43b98e0d2af4fd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:34:06 2013 +0100 winex11: Explicitly set the border pixel when creating the client window. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ec15afc..d19a5fd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1384,11 +1384,12 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; attr.event_mask = ExposureMask; + attr.border_pixel = 0; data->client_window = XCreateWindow( data->display, data->whole_window, x, y, cx, cy, 0, default_visual.depth, InputOutput, visual->visual, CWBitGravity | CWWinGravity | CWBackingStore | - CWColormap | CWEventMask, &attr ); + CWColormap | CWEventMask | CWBorderPixel, &attr ); if (!data->client_window) return 0; XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd );

1 0

Alexandre Julliard : winex11: Wait for the client window to be created on the server side.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 4391deb930fa2aaccae9c420c3ca38e313500d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4391deb930fa2aaccae9c420c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:34:28 2013 +0100 winex11: Wait for the client window to be created on the server side. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d19a5fd..05cd75f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1394,7 +1394,7 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); XMapWindow( data->display, data->client_window ); - XFlush( data->display ); + XSync( data->display, False ); return data->client_window; }

1 0

Francois Gouget : gdiplus/tests: Skip the tests if unable to load the TIFF image.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 06489c6501f8b59489da3de1b307ee44401dd1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06489c6501f8b59489da3de1b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 4 14:35:43 2013 +0100 gdiplus/tests: Skip the tests if unable to load the TIFF image. On Windows XP most versions of gdiplus (i.e. older than 5.2) do not support TIFF. --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index feab70b..6b4a34c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3105,8 +3105,11 @@ static void test_tiff_properties(void) PropertyItem *prop_item; image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipImageGetFrameDimensionsCount(image, &dim_count); expect(Ok, status); @@ -3360,8 +3363,11 @@ static void test_tiff_palette(void) /* 1bpp TIFF without palette */ image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipGetImagePixelFormat(image, &format); expect(Ok, status);

1 0

Francois Gouget : mshtml/tests: Make test_insert_adjacent_elems() static.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: b039192d3b679b9ff15ef4dff0f5b7abc59be426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b039192d3b679b9ff15ef4dff… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 4 14:36:29 2013 +0100 mshtml/tests: Make test_insert_adjacent_elems() static. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 913411c..2fde048 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4195,7 +4195,7 @@ static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const cha IHTMLElement_Release(ret_elem); } -void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent) +static void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent) { IHTMLElement *elem, *elem2;

1 0

Jacek Caban : wininet: Use secure variable instead of ssl_s handle in a few more places.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 125583c4d9e7a0b2610df2e4374729631f57db53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125583c4d9e7a0b2610df2e43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 17:48:59 2013 +0100 wininet: Use secure variable instead of ssl_s handle in a few more places. --- dlls/wininet/netconnection.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e423830..0d74adf 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -702,12 +702,12 @@ void free_netconn(netconn_t *netconn) { server_release(netconn->server); + if (netconn->secure) { #ifdef SONAME_LIBSSL - if (netconn->ssl_s) { pSSL_shutdown(netconn->ssl_s); pSSL_free(netconn->ssl_s); - } #endif + } closesocket(netconn->socket); heap_free(netconn); @@ -936,7 +936,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, else { #ifdef SONAME_LIBSSL - if(!connection->ssl_s) { + if(!connection->secure) { FIXME("not connected\n"); return ERROR_NOT_SUPPORTED; } @@ -972,7 +972,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * else { #ifdef SONAME_LIBSSL - if(!connection->ssl_s) { + if(!connection->secure) { FIXME("not connected\n"); return ERROR_NOT_SUPPORTED; } @@ -1015,7 +1015,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) else { #ifdef SONAME_LIBSSL - *available = connection->ssl_s ? pSSL_pending(connection->ssl_s) : 0; + *available = pSSL_pending(connection->ssl_s); #else FIXME("not supported on this platform\n"); return FALSE; @@ -1060,7 +1060,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) X509* cert; LPCVOID r = NULL; - if (!connection->ssl_s) + if (!connection->secure) return NULL; cert = pSSL_get_peer_certificate(connection->ssl_s); @@ -1082,7 +1082,7 @@ int NETCON_GetCipherStrength(netconn_t *connection) #endif int bits = 0; - if (!connection->ssl_s) + if (!connection->secure) return 0; cipher = pSSL_get_current_cipher(connection->ssl_s); if (!cipher)

1 0

Andrew Eikum : winmm/tests: Add another valid return code.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: db92670f97e653a213484dab997f4941afc562ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92670f97e653a213484dab9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 4 11:43:31 2013 -0600 winmm/tests: Add another valid return code. --- dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 32deb28..329130a 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -648,7 +648,7 @@ static void wave_in_tests(void) rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 992cca7..eb619cd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1419,7 +1419,7 @@ static void wave_out_tests(void) rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||

1 0

Jeff Muizelaar : dbghelp: Store the vendor id in the correct order.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 03cae026114b175dfe15a68c5a9ae16b575c9c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cae026114b175dfe15a68c5… Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Fri Mar 1 10:12:10 2013 -0500 dbghelp: Store the vendor id in the correct order. --- dlls/dbghelp/minidump.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7a21e8b..b00f9e2 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -635,8 +635,8 @@ static unsigned dump_system_info(struct dump_context* dc) do_x86cpuid(0, regs0); mdSysInfo.Cpu.X86CpuInfo.VendorId[0] = regs0[1]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[2]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[2]; do_x86cpuid(1, regs1); mdSysInfo.Cpu.X86CpuInfo.VersionInformation = regs1[0]; mdSysInfo.Cpu.X86CpuInfo.FeatureInformation = regs1[3];

1 0

Petr Kočandrle : po: Completed WineMine Czech translation.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: ce4291c513ad7bbc010ee9d31614014495a5dd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4291c513ad7bbc010ee9d31… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Fri Mar 1 14:39:18 2013 +0100 po: Completed WineMine Czech translation. --- po/cs.po | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index cc63ae6..4e84598 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13825,7 +13825,7 @@ msgstr "" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Hra" #: winemine.rc:35 msgid "&New\tF2" @@ -13833,7 +13833,7 @@ msgstr "&Nová\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "&Otazníky" #: winemine.rc:39 msgid "&Beginner" @@ -13845,28 +13845,25 @@ msgstr "&Pokročilý" #: winemine.rc:41 msgid "&Expert" -msgstr "" +msgstr "E&xpert" #: winemine.rc:42 msgid "&Custom..." -msgstr "&Dle libosti..." +msgstr "&Vlastní..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" -msgstr "Ne&jlepší časy" +msgstr "N&ejlepší časy" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&O Wine" +msgstr "&O WineMinách" #: winemine.rc:56 msgid "Fastest Times" msgstr "Nejlepší časy" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Nejlepší časy" @@ -13884,11 +13881,11 @@ msgstr "Expert" #: winemine.rc:74 msgid "Congratulations!" -msgstr "Gratulujeme !" +msgstr "Gratulace!" #: winemine.rc:76 msgid "Please enter your name" -msgstr "Prosím, zadejte své jméno" +msgstr "Zadej prosím své jméno" #: winemine.rc:84 msgid "Custom Game" @@ -13900,7 +13897,7 @@ msgstr "Řádky" #: winemine.rc:87 msgid "Columns" -msgstr "" +msgstr "Sloupce" #: winemine.rc:88 msgid "Mines" @@ -13908,7 +13905,7 @@ msgstr "Miny" #: winemine.rc:27 msgid "WineMine" -msgstr "WineMine" +msgstr "WineMiny" #: winemine.rc:28 msgid "Nobody"

1 0

Nikolay Sivov : msxml3: Filter unsupported child nodes in insertBefore() for elements.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 2d5c9f4f462f50cd82536dee3c5c9e7dfd6ad336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c9f4f462f50cd82536dee3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:20:13 2013 +0400 msxml3: Filter unsupported child nodes in insertBefore() for elements. --- dlls/msxml3/element.c | 22 +++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 8 +++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 929830b..70360e5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -301,13 +301,29 @@ static HRESULT WINAPI domelem_get_attributes( static HRESULT WINAPI domelem_insertBefore( IXMLDOMElement *iface, IXMLDOMNode* newNode, VARIANT refChild, - IXMLDOMNode** outOldNode) + IXMLDOMNode** old_node) { domelem *This = impl_from_IXMLDOMElement( iface ); + DOMNodeType type; + HRESULT hr; - TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), old_node); + + hr = IXMLDOMNode_get_nodeType(newNode, &type); + if (hr != S_OK) return hr; - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("new node type %d\n", type); + switch (type) + { + case NODE_DOCUMENT: + case NODE_DOCUMENT_TYPE: + case NODE_ENTITY: + case NODE_NOTATION: + if (old_node) *old_node = NULL; + return E_FAIL; + default: + return node_insert_before(&This->node, newNode, &refChild, old_node); + } } static HRESULT WINAPI domelem_replaceChild( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c1bfc1a..794df03 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4,7 +4,7 @@ * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes * Copyright 2010-2011 Adam Martinson for CodeWeavers - * Copyright 2010-2012 Nikolay Sivov for CodeWeavers + * Copyright 2010-2013 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8484,6 +8484,12 @@ static void test_insertBefore(void) todo_wine EXPECT_REF(elem2, 2); + /* document to element */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)doc, v, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = NULL; node = NULL;

1 0

Nikolay Sivov : msxml3: CDATA nodes can't have children.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 431e77bec4a022dbed0dc2ead80d20250193fdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=431e77bec4a022dbed0dc2ead… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:38:27 2013 +0400 msxml3: CDATA nodes can't have children. --- dlls/msxml3/cdata.c | 20 ++++++++++---------- dlls/msxml3/tests/domdoc.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 6b3c065..7fd4a37 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -290,10 +290,9 @@ static HRESULT WINAPI domcdata_insertBefore( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - - FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode); - - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + if (outOldNode) *outOldNode = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_replaceChild( @@ -303,10 +302,9 @@ static HRESULT WINAPI domcdata_replaceChild( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - - FIXME("(%p)->(%p %p %p) needs tests\n", This, newNode, oldNode, outOldNode); - - return node_replace_child(&This->node, newNode, oldNode, outOldNode); + TRACE("(%p)->(%p %p %p)\n", This, newNode, oldNode, outOldNode); + if (outOldNode) *outOldNode = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_removeChild( @@ -315,7 +313,8 @@ static HRESULT WINAPI domcdata_removeChild( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p %p)\n", This, child, oldChild); - return node_remove_child(&This->node, child, oldChild); + if (oldChild) *oldChild = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_appendChild( @@ -324,7 +323,8 @@ static HRESULT WINAPI domcdata_appendChild( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p %p)\n", This, child, outChild); - return node_append_child(&This->node, child, outChild); + if (outChild) *outChild = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_hasChildNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 794df03..d69547f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8370,6 +8370,22 @@ static void test_insertBefore(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(cdata != NULL, "got %p\n", cdata); + EXPECT_NO_CHILDREN(cdata); + + /* attribute to cdata */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)attr, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* document to cdata */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)doc, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + V_VT(&v) = VT_NULL; node = (void*)0xdeadbeef; hr = IXMLDOMDocument_insertBefore(doc3, cdata, v, &node);

1 0