February 2012 - Wine-Commits

Vincent Povirk : shell32: Properly double-null-terminate the filter in the run/browse dialog.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: dd65da7dcec388036f875c91ed8197368001ab7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd65da7dcec388036f875c91e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Feb 26 13:05:00 2012 -0600 shell32: Properly double-null-terminate the filter in the run/browse dialog. --- dlls/shell32/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 84d8799..28a25fd 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -266,7 +266,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER_EXE, filter_exe, 256); LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER_ALL, filter_all, 256); LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); - snprintfW( filter, MAX_PATH, filterW, filter_exe, 0, 0, filter_all, 0 ); + snprintfW( filter, MAX_PATH, filterW, filter_exe, 0, 0, filter_all, 0, 0 ); ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(OPENFILENAMEW);

1 0

Alexandre Julliard : README: Updates.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: b93b90e2919f6b4fd15c553de5b0ce44eea655ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93b90e2919f6b4fd15c553de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 15:38:22 2012 +0100 README: Updates. --- README | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README b/README index baa6ab3..2b3e38f 100644 --- a/README +++ b/README @@ -28,8 +28,8 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: - Linux version 2.0.36 or above - FreeBSD 6.3 or later + Linux version 2.0.36 or later + FreeBSD 7.0 or later Solaris x86 9 or later NetBSD-current Mac OS X 10.4 or later @@ -38,15 +38,9 @@ As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which support kernel threads may be supported in the future. -Linux info: - While Linux 2.2.x should still work and Linux 2.0.x may still work - (older 2.0.x versions had thread-related crashes), - it's best to have a current kernel such as 2.4.x or 2.6.x. - FreeBSD info: - Wine will generally not work properly on versions before FreeBSD - 6.3 or 7.0, and FreeBSD 6.3 has additional patches available. See - http://wiki.freebsd.org/Wine for more information. + Wine will generally not work properly on versions before FreeBSD 7.0. + See http://wiki.freebsd.org/Wine for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -66,8 +60,7 @@ Supported file systems: Wine should run on most file systems. A few compatibility problems have also been reported using files accessed through Samba. Also, NTFS does not provide all the file system features needed by some - applications. Using a native Linux file system such as ext3 is - recommended. + applications. Using a native Unix file system is recommended. Basic requirements: You need to have the X11 development include files installed

1 0

Łukasz Wojniłowicz : news: Put out a call for translators in Polish.
by Jeremy Newman Feb. 27, 2012

Feb. 27, 2012

Module: website Branch: master Commit: d253806ccb5506a1f5d10cc7005fe3160ad4342a URL: http://source.winehq.org/git/website.git/?a=commit;h=d253806ccb5506a1f5d10c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 25 21:00:51 2012 +0100 news: Put out a call for translators in Polish. --- news/pl/2012022001.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012022001.xml b/news/pl/2012022001.xml new file mode 100644 index 0000000..241e4d9 --- /dev/null +++ b/news/pl/2012022001.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 20, 2012</date> +<title>Potrzebni tłumacze!</title> +<body> +Strona stanu tłumaczeń Wine <a href="http://fgouget.free.fr/wine-po/"></a> +pokazuje tylko 12 kompletnych tłumaczeń (przyp. tłum. Polski jest w pełni przetłumaczony). +Chcielibyśmy poprawić się do wersji 1.4. +Szczęśliwie, zaczynając od wersji 1.4 Wine używa plików PO, czyniąc przez +to tłumaczenie łatwiejszym niż poprzednio. Tak więc dowiedz się jak +<a href="http://wiki.winehq.org/Translating">rozpocząć</a> i pomóż nam +uczynić Wine używalnym w twoim kraju. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc5
by Jeremy Newman Feb. 27, 2012

Feb. 27, 2012

Module: website Branch: master Commit: 3265521526f07f66a3f898411ab5ebd6d477e523 URL: http://source.winehq.org/git/website.git/?a=commit;h=3265521526f07f66a3f898… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 25 21:00:52 2012 +0100 Polish translation for release 1.4-rc5 --- news/pl/2012022401.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012022401.xml b/news/pl/2012022401.xml new file mode 100644 index 0000000..934ffbd --- /dev/null +++ b/news/pl/2012022401.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 24, 2012</date> +<title>Wydano Wine 1.4-rc5</title> +<body> + Wydanie rozwojowe Wine 1.4-rc5 jest już dostępne. + <a href="{$root}/announce/1.4-rc5">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.4-rc5
by Jeremy Newman Feb. 27, 2012

Feb. 27, 2012

Module: website Branch: master Commit: cccae5d60cbfc474e3fea45495c5baacde9d3911 URL: http://source.winehq.org/git/website.git/?a=commit;h=cccae5d60cbfc474e3fea4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 24 21:17:57 2012 +0100 French translation for release 1.4-rc5 --- news/fr/2012022401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012022401.xml b/news/fr/2012022401.xml new file mode 100644 index 0000000..e9dd929 --- /dev/null +++ b/news/fr/2012022401.xml @@ -0,0 +1,15 @@ +<news> +<date>24 février 2012</date> +<title>Sortie de Wine 1.4-rc5</title> +<body> + La version de développement 1.4-rc5 de Wine est disponible. + <a href="{$root}/announce/1.4-rc5">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc5.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.4-rc5
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: website Branch: master Commit: 90be4b262a08a23bcf472a37e3dc868e51ceed83 URL: http://source.winehq.org/git/website.git/?a=commit;h=90be4b262a08a23bcf472a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 19:40:38 2012 +0100 Wine release 1.4-rc5 --- news/en/2012022401.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012022401.xml b/news/en/2012022401.xml new file mode 100644 index 0000000..4a3eb14 --- /dev/null +++ b/news/en/2012022401.xml @@ -0,0 +1,12 @@ +<news> +<date>February 24, 2012</date> +<title>Wine 1.4-rc5 Released</title> +<body> + The Wine development release 1.4-rc5 is now available. + <a href="{$root}/announce/1.4-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.4-rc5.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: b05be807583eca27dc0a4de896ba901bac54088c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05be807583eca27dc0a4de89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 19:30:11 2012 +0100 Release 1.4-rc5. --- ANNOUNCE | 364 ++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 180 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b05be807583eca27dc0a4…

1 0

Tag wine-1.4-rc5 : Alexandre Julliard : Release 1.4-rc5
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: refs/tags/wine-1.4-rc5 Tag: 8b0b05cc58a99f77bbc1299c0d496d535d1906aa URL: http://source.winehq.org/git/wine.git/?a=tag;h=8b0b05cc58a99f77bbc1299c0d49… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 19:30:11 2012 +0100 Release 1.4-rc5

1 0

Francois Gouget : po: Remove English strings from the Japanese shell folder path translations.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 4c4e51700932e9ed6355afc1bf8ca0d18282634f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4e51700932e9ed6355afc1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 14:59:38 2012 +0100 po: Remove English strings from the Japanese shell folder path translations. --- po/ja.po | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/po/ja.po b/po/ja.po index c5a4ce8..fa128ec 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7824,48 +7824,48 @@ msgstr "プログラム" #: shell32.rc:201 msgid "My Documents" -msgstr "My Documents" +msgstr "" #: shell32.rc:202 msgid "Favorites" -msgstr "Favorites" +msgstr "" #: shell32.rc:203 msgid "StartUp" -msgstr "StartUp" +msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" -msgstr "My Music" +msgstr "" #: shell32.rc:206 msgid "My Videos" -msgstr "My Videos" +msgstr "" #: shell32.rc:207 msgctxt "directory" msgid "Desktop" -msgstr "Desktop" +msgstr "" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: shell32.rc:212 msgid "Program Files" @@ -7873,7 +7873,7 @@ msgstr "Program Files" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 msgid "Common Files" @@ -7881,23 +7881,23 @@ msgstr "Common Files" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "Documents" +msgstr "" #: shell32.rc:217 msgid "Administrative Tools" -msgstr "Administrative Tools" +msgstr "" #: shell32.rc:218 msgid "Music" -msgstr "Music" +msgstr "" #: shell32.rc:219 msgid "Pictures" -msgstr "Pictures" +msgstr "" #: shell32.rc:220 msgid "Videos" -msgstr "Videos" +msgstr "" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7905,19 +7905,19 @@ msgstr "Program Files (x86)" #: shell32.rc:221 msgid "Contacts" -msgstr "Contacs" +msgstr "" #: shell32.rc:222 winefile.rc:112 msgid "Links" -msgstr "Links" +msgstr "" #: shell32.rc:223 msgid "Slide Shows" -msgstr "Slide Shows" +msgstr "" #: shell32.rc:224 msgid "Playlists" -msgstr "Playlists" +msgstr "" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -7933,35 +7933,35 @@ msgstr "機種名" #: shell32.rc:225 msgid "Sample Music" -msgstr "Sample Music" +msgstr "" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "Sample Pictures" +msgstr "" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "Sample Playlists" +msgstr "" #: shell32.rc:228 msgid "Sample Videos" -msgstr "Sample Videos" +msgstr "" #: shell32.rc:229 msgid "Saved Games" -msgstr "Saved Games" +msgstr "" #: shell32.rc:230 msgid "Searches" -msgstr "Searches" +msgstr "" #: shell32.rc:231 msgid "Users" -msgstr "Users" +msgstr "" #: shell32.rc:233 msgid "Downloads" -msgstr "Downloads" +msgstr "" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied."

1 0

Alexandre Julliard : gdi32: Avoid using uninitialized value in DIB pattern enhmetafile record.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: fd40d65cfa2a67f53ba5ff4969512855e68e278e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd40d65cfa2a67f53ba5ff496… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 17:03:57 2012 +0100 gdi32: Avoid using uninitialized value in DIB pattern enhmetafile record. --- dlls/gdi32/enhmfdrv/objects.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 7753216..789c7a5 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -172,11 +172,11 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ); emr->cbBmi = info_size; } - emr->emr.nSize = emr->offBits + emr->cbBits; emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); emr->iUsage = usage; emr->offBits = emr->offBmi + emr->cbBmi; emr->cbBits = info->bmiHeader.biSizeImage; + emr->emr.nSize = emr->offBits + emr->cbBits; memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); memcpy( (BYTE *)emr + emr->offBits, bits, emr->cbBits );

1 0

Henri Verbeet : wined3d: Disable z-clipping for transformed vertices when WINED3D_RS_ZENABLE is disabled .
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: d17f037fb11b8a654a38040aaefbdce5f2358963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17f037fb11b8a654a38040aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:46 2012 +0100 wined3d: Disable z-clipping for transformed vertices when WINED3D_RS_ZENABLE is disabled. --- dlls/wined3d/state.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6c92e6e..6974321 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -93,16 +93,17 @@ static void state_lighting(struct wined3d_context *context, const struct wined3d static void state_zenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + enum wined3d_depth_buffer_type zenable = state->render_states[WINED3D_RS_ZENABLE]; + static UINT once; + /* No z test without depth stencil buffers */ if (!state->fb->depth_stencil) { TRACE("No Z buffer - disabling depth test\n"); - glDisable(GL_DEPTH_TEST); /* This also disables z writing in gl */ - checkGLcall("glDisable GL_DEPTH_TEST"); - return; + zenable = WINED3D_ZB_FALSE; } - switch (state->render_states[WINED3D_RS_ZENABLE]) + switch (zenable) { case WINED3D_ZB_FALSE: glDisable(GL_DEPTH_TEST); @@ -118,9 +119,25 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ FIXME("W buffer is not well handled\n"); break; default: - FIXME("Unrecognized depth buffer type %#x.\n", - state->render_states[WINED3D_RS_ZENABLE]); + FIXME("Unrecognized depth buffer type %#x.\n", zenable); + break; + } + + if (context->gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (!zenable && context->swapchain->device->strided_streams.position_transformed) + { + glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } } + else if (!zenable && !once++) + FIXME("Z buffer disabled, but ARB_depth_clamp isn't supported.\n"); } static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4647,6 +4664,9 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine transform_texture(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); } } + + if (transformed != wasrhw && !isStateDirty(context, STATE_RENDER(WINED3D_RS_ZENABLE))) + state_zenable(context, state, STATE_RENDER(WINED3D_RS_ZENABLE)); } static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Nikolay Sivov : msxml3/tests: Tests for IMXAttributes::clear().
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: be7d4257f8358833adc08da85397313b1b5d33e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7d4257f8358833adc08da85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 18:09:27 2012 +0300 msxml3/tests: Tests for IMXAttributes::clear(). --- dlls/msxml3/tests/saxreader.c | 83 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c8f9bd1..cfead73 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3092,6 +3092,22 @@ static const addattribute_test_t addattribute_data[] = { { &CLSID_SAXAttributes30, NULL, NULL, "ns:qname", NULL, "value", E_INVALIDARG }, { &CLSID_SAXAttributes40, NULL, NULL, "ns:qname", NULL, "value", E_INVALIDARG }, { &CLSID_SAXAttributes60, NULL, NULL, "ns:qname", NULL, "value", S_OK }, + + { &CLSID_SAXAttributes, NULL, "qname", "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes30, NULL, "qname", "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes40, NULL, "qname", "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes60, NULL, "qname", "ns:qname", NULL, "value", S_OK }, + + { &CLSID_SAXAttributes, "uri", "qname", "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes30, "uri", "qname", "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes40, "uri", "qname", "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes60, "uri", "qname", "ns:qname", NULL, "value", S_OK }, + + { &CLSID_SAXAttributes, "uri", "qname", "ns:qname", "type", "value", S_OK }, + { &CLSID_SAXAttributes30, "uri", "qname", "ns:qname", "type", "value", S_OK }, + { &CLSID_SAXAttributes40, "uri", "qname", "ns:qname", "type", "value", S_OK }, + { &CLSID_SAXAttributes60, "uri", "qname", "ns:qname", "type", "value", S_OK }, + { NULL } }; @@ -3156,6 +3172,72 @@ static void test_mxattr_addAttribute(void) free_bstrs(); } +static void test_mxattr_clear(void) +{ + ISAXAttributes *saxattr; + IMXAttributes *mxattr; + const WCHAR *ptr; + HRESULT hr; + int len; + + hr = CoCreateInstance(&CLSID_SAXAttributes, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXAttributes, (void**)&mxattr); + EXPECT_HR(hr, S_OK); + + hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); + EXPECT_HR(hr, S_OK); + + hr = ISAXAttributes_getQName(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), + _bstr_("qname"), _bstr_("type"), _bstr_("value")); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = ISAXAttributes_getLength(saxattr, &len); + EXPECT_HR(hr, S_OK); + ok(len == 1, "got %d\n", len); + + len = -1; + hr = ISAXAttributes_getQName(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + ok(len == -1, "got %d\n", len); + + ptr = (void*)0xdeadbeef; + hr = ISAXAttributes_getQName(saxattr, 0, &ptr, NULL); + EXPECT_HR(hr, E_POINTER); + ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); + + len = 0; + hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); + EXPECT_HR(hr, S_OK); + ok(len == 5, "got %d\n", len); + ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); + + hr = IMXAttributes_clear(mxattr); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = ISAXAttributes_getLength(saxattr, &len); + EXPECT_HR(hr, S_OK); + ok(len == 0, "got %d\n", len); + + len = -1; + ptr = (void*)0xdeadbeef; + hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(len == -1, "got %d\n", len); + ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); + + IMXAttributes_Release(mxattr); + ISAXAttributes_Release(saxattr); + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -3208,6 +3290,7 @@ START_TEST(saxreader) if (is_clsid_supported(&CLSID_SAXAttributes, mxattributes_support_data)) { test_mxattr_addAttribute(); + test_mxattr_clear(); } else skip("SAXAttributes not supported\n");

1 0

Alexandre Julliard : gdi32: Use 64-bit values when computing ellipses to avoid overflows.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: c65de04789ee8c5bf1f6c9d869ac53087af0fcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65de04789ee8c5bf1f6c9d86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 15:55:00 2012 +0100 gdi32: Use 64-bit values when computing ellipses to avoid overflows. --- dlls/gdi32/dibdrv/graphics.c | 12 ++++++------ dlls/gdi32/region.c | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 3251f36..2f67efe 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -78,11 +78,11 @@ static int ellipse_first_quadrant( int width, int height, POINT *data ) { const int a = width - 1; const int b = height - 1; - const int asq = 8 * a * a; - const int bsq = 8 * b * b; - int dx = 4 * b * b * (1 - a); - int dy = 4 * a * a * (1 + (b % 2)); - int err = dx + dy + a * a * (b % 2); + const INT64 asq = (INT64)8 * a * a; + const INT64 bsq = (INT64)8 * b * b; + INT64 dx = (INT64)4 * b * b * (1 - a); + INT64 dy = (INT64)4 * a * a * (1 + (b % 2)); + INT64 err = dx + dy + a * a * (b % 2); int pos = 0; POINT pt; @@ -93,7 +93,7 @@ static int ellipse_first_quadrant( int width, int height, POINT *data ) while (pt.x >= width / 2) { - int e2 = 2 * err; + INT64 e2 = 2 * err; data[pos++] = pt; if (e2 >= dx) { diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 336e56e..231a7cf 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -754,7 +754,8 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, { RGNOBJ * obj; HRGN hrgn = 0; - int a, b, i, x, y, asq, bsq, dx, dy, err; + int a, b, i, x, y; + INT64 asq, bsq, dx, dy, err; RECT *rects; /* Make the dimensions sensible */ @@ -788,10 +789,10 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, a = ellipse_width - 1; b = ellipse_height - 1; - asq = 8 * a * a; - bsq = 8 * b * b; - dx = 4 * b * b * (1 - a); - dy = 4 * a * a * (1 + (b % 2)); + asq = (INT64)8 * a * a; + bsq = (INT64)8 * b * b; + dx = (INT64)4 * b * b * (1 - a); + dy = (INT64)4 * a * a * (1 + (b % 2)); err = dx + dy + a * a * (b % 2); x = 0; @@ -802,7 +803,7 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, while (x <= ellipse_width / 2) { - int e2 = 2 * err; + INT64 e2 = 2 * err; if (e2 >= dx) { x++;

1 0

Alexandre Julliard : comdlg32: Avoid crash when driver name doesn' t contain a backslash.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 67a0db3c38ead3178912d44604fd90440b57f5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a0db3c38ead3178912d4460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 12:48:00 2012 +0100 comdlg32: Avoid crash when driver name doesn't contain a backslash. --- dlls/comdlg32/printdlg.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d074563..7ce9148 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -321,8 +321,10 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName, LPDEVNAMES lpDevNames; char buf[260]; DWORD dwBufLen = sizeof(buf); + const char *p; - DeviceDriverName = strrchr(DeviceDriverName, '\\') + 1; + p = strrchr( DeviceDriverName, '\\' ); + if (p) DeviceDriverName = p + 1; size = strlen(DeviceDriverName) + 1 + strlen(DeviceName) + 1 @@ -366,8 +368,10 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, LPDEVNAMES lpDevNames; WCHAR bufW[260]; DWORD dwBufLen = sizeof(bufW) / sizeof(WCHAR); + const WCHAR *p; - DeviceDriverName = strrchrW(DeviceDriverName, '\\') + 1; + p = strrchrW( DeviceDriverName, '\\' ); + if (p) DeviceDriverName = p + 1; size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 + sizeof(WCHAR)*lstrlenW(DeviceName) + 2

1 0

Henri Verbeet : ddraw/tests: Add tests for z-clipping with D3DRENDERSTATE_ZENABLE disabled.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 19199bc5244c4cc0d6fe6e82608fc8c7b7cc2e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19199bc5244c4cc0d6fe6e826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:47 2012 +0100 ddraw/tests: Add tests for z-clipping with D3DRENDERSTATE_ZENABLE disabled. --- dlls/ddraw/tests/ddraw1.c | 214 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 118 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 95 ++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 63 +++++++++++++ 4 files changed, 490 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19199bc5244c4cc0d6fe6…

1 0

Henri Verbeet : d3d8/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 4e9cf00097d88f045743799f637645c242422d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9cf00097d88f045743799f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:48 2012 +0100 d3d8/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled. --- dlls/d3d8/tests/visual.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cafcd32..d8e1ed2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -25,6 +25,16 @@ static HMODULE d3d8_handle = 0; +struct vec3 +{ + float x, y, z; +}; + +struct vec4 +{ + float x, y, z, w; +}; + static HWND create_window(void) { WNDCLASS wc = {0}; @@ -2766,6 +2776,140 @@ static void resz_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(original_rt); } +static void zenable_test(IDirect3DDevice8 *device) +{ + static const struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, + }; + D3DCOLOR color; + D3DCAPS8 caps; + HRESULT hr; + UINT x, y; + UINT i, j; + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1) + && caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + static const DWORD vs_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40000, /* mov oD0, v0 */ + 0x0000ffff + }; + static const DWORD ps_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, -0.5f}, + {-1.0f, 1.0f, -0.5f}, + { 1.0f, -1.0f, 1.5f}, + { 1.0f, 1.0f, 1.5f}, + }; + static const D3DCOLOR expected[] = + { + 0x00ff0000, 0x0060df60, 0x009fdf9f, 0x00ff0000, + 0x00ff0000, 0x00609f60, 0x009f9f9f, 0x00ff0000, + 0x00ff0000, 0x00606060, 0x009f609f, 0x00ff0000, + 0x00ff0000, 0x00602060, 0x009f209f, 0x00ff0000, + }; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_END() + }; + DWORD vs, ps; + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_code, &vs, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreatePixelShader(device, ps_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, expected[i * 4 + j], 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", expected[i * 4 + j], x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to delete pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to delete vertex shader, hr %#x.\n", hr); + } +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -2845,6 +2989,7 @@ START_TEST(visual) intz_test(device_ptr); shadow_test(device_ptr); multisample_copy_rects_test(device_ptr); + zenable_test(device_ptr); resz_test(device_ptr); cleanup:

1 0

Henri Verbeet : d3d9/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 8f6ddf789e5fb46770926239ec92fab49f920ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6ddf789e5fb46770926239e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:49 2012 +0100 d3d9/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled. --- dlls/d3d9/tests/visual.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f0f204..72e4d21 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -34,6 +34,16 @@ static HMODULE d3d9_handle = 0; +struct vec3 +{ + float x, y, z; +}; + +struct vec4 +{ + float x, y, z, w; +}; + static HWND create_window(void) { WNDCLASS wc = {0}; @@ -13755,6 +13765,137 @@ static void resz_test(IDirect3D9 *d3d9) cleanup_device(device); } +static void zenable_test(IDirect3DDevice9 *device) +{ + static const struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, + }; + D3DCOLOR color; + D3DCAPS9 caps; + HRESULT hr; + UINT x, y; + UINT i, j; + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1) + && caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + static const DWORD vs_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40000, /* mov oD0, v0 */ + 0x0000ffff + }; + static const DWORD ps_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, -0.5f}, + {-1.0f, 1.0f, -0.5f}, + { 1.0f, -1.0f, 1.5f}, + { 1.0f, 1.0f, 1.5f}, + }; + static const D3DCOLOR expected[] = + { + 0x00ff0000, 0x0060df60, 0x009fdf9f, 0x00ff0000, + 0x00ff0000, 0x00609f60, 0x009f9f9f, 0x00ff0000, + 0x00ff0000, 0x00606060, 0x009f609f, 0x00ff0000, + 0x00ff0000, 0x00602060, 0x009f209f, 0x00ff0000, + }; + + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_code, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, expected[i * 4 + j], 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", expected[i * 4 + j], x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(ps); + IDirect3DVertexShader9_Release(vs); + } +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -13931,6 +14072,7 @@ START_TEST(visual) clip_planes_test(device_ptr); update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); + zenable_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : kernel32: Add a test for LoadLibrary called on a not DLL image.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 0e7314a2987a9a802b650a31252df984c5216a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7314a2987a9a802b650a312… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 24 16:33:14 2012 +0800 kernel32: Add a test for LoadLibrary called on a not DLL image. --- dlls/kernel32/tests/loader.c | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9c969c2..e98ebc1 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -559,7 +559,7 @@ static void test_ImportDescriptors(void) } } -static void test_image_mapping(const char *dll_name, DWORD scn_page_access) +static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; NTSTATUS status; @@ -617,7 +617,6 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access) } ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); ok(addr2 != 0, "mapped address should be valid\n"); - ok(addr2 != addr1, "mapped addresses should be different\n"); SetLastError(0xdeadbeef); @@ -635,6 +634,7 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access) ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); addr2 = MapViewOfFile(hmap, 0, 0, 0, 0); + ok(addr2 != 0, "mapped address should be valid\n"); ok(addr2 != addr1, "mapped addresses should be different\n"); SetLastError(0xdeadbeef); @@ -650,6 +650,24 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access) UnmapViewOfFile(addr2); + SetLastError(0xdeadbeef); + addr2 = LoadLibrary(dll_name); + if (is_dll) + { + ok(!addr2, "LoadLibrary should fail, is_dll %d\n", is_dll); + ok(GetLastError() == ERROR_INVALID_ADDRESS, "expected ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + } + else + { + BOOL ret; + ok(addr2 != 0, "LoadLibrary error %d, is_dll %d\n", GetLastError(), is_dll); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(addr2); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + wine_is_broken: status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); @@ -955,13 +973,21 @@ static void test_section_access(void) ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); - test_image_mapping(dll_name, td[i].scn_page_access); + test_image_mapping(dll_name, td[i].scn_page_access, TRUE); /* reset IMAGE_FILE_DLL otherwise CreateProcess fails */ nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED; SetLastError(0xdeadbeef); hfile = CreateFile(dll_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok (hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + /* LoadLibrary called on an already memory-mapped file in + * test_image_mapping() above leads to a file handle leak + * under nt4, and inability to overwrite and delete the file + * due to sharing violation error. Ignore it and skip the test, + * but leave a not deletable temporary file. + */ + ok(hfile != INVALID_HANDLE_VALUE || broken(hfile == INVALID_HANDLE_VALUE) /* nt4 */, + "CreateFile error %d\n", GetLastError()); + if (hfile == INVALID_HANDLE_VALUE) goto nt4_is_broken; SetFilePointer(hfile, sizeof(dos_header), NULL, FILE_BEGIN); SetLastError(0xdeadbeef); ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); @@ -1002,11 +1028,12 @@ static void test_section_access(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - test_image_mapping(dll_name, td[i].scn_page_access); + test_image_mapping(dll_name, td[i].scn_page_access, FALSE); +nt4_is_broken: SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); - ok(ret, "DeleteFile error %d\n", GetLastError()); + ok(ret || broken(!ret) /* nt4 */, "DeleteFile error %d\n", GetLastError()); } }

1 0

Eduardo García : po: Spanish translation update.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 27e028cb54f4bf5c8a887cd88122c75232c741a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e028cb54f4bf5c8a887cd88… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Fri Feb 24 13:44:53 2012 +0100 po: Spanish translation update. --- po/es.po | 155 ++++++++++++++++++++----------------------------------------- 1 files changed, 51 insertions(+), 104 deletions(-) diff --git a/po/es.po b/po/es.po index b66dcc8..d52660b 100644 --- a/po/es.po +++ b/po/es.po @@ -3167,20 +3167,14 @@ msgid "Stop" msgstr "Detener" #: hhctrl.rc:42 ieframe.rc:66 shell32.rc:59 -#, fuzzy msgid "Refresh" -msgstr "" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Recargar\n" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Actualizar" +msgstr "Actualizar" #: hhctrl.rc:43 ieframe.rc:63 msgid "Back" msgstr "Atrás" #: hhctrl.rc:44 -#, fuzzy msgctxt "table of contents" msgid "Home" msgstr "Inicio" @@ -7448,13 +7442,8 @@ msgstr "" "podrá activarlo utilizando el programa que lo creó." #: oledlg.rc:27 shell32.rc:194 -#, fuzzy msgid "Browse" -msgstr "" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Explorar\n" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Examinar" +msgstr "Explorar" #: oledlg.rc:28 msgid "" @@ -7755,13 +7744,8 @@ msgid "&Undo" msgstr "&Deshacer" #: shdoclc.rc:93 shell32.rc:102 user32.rc:60 -#, fuzzy msgid "&Delete" -msgstr "" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"&Eliminar\n" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"&Borrar" +msgstr "&Eliminar" #: shdoclc.rc:100 shell32.rc:94 msgid "&Select" @@ -7792,13 +7776,8 @@ msgid "&Table Properties" msgstr "Propiedades de &tabla" #: shdoclc.rc:116 shell32.rc:61 -#, fuzzy msgid "Paste" -msgstr "" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"&Pegar\n" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Pegar" +msgstr "Pegar" #: shdoclc.rc:118 msgid "&Print" @@ -8019,7 +7998,7 @@ msgstr "&Restaurar" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "&Eliminar" #: shell32.rc:95 msgid "E&xplore" @@ -8034,13 +8013,8 @@ msgid "Create &Link" msgstr "C&rear acceso directo" #: shell32.rc:103 regedit.rc:91 -#, fuzzy msgid "&Rename" -msgstr "" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Re&nombrar\n" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"&Renombrar" +msgstr "Re&nombrar" #: shell32.rc:114 notepad.rc:36 oleview.rc:35 regedit.rc:38 view.rc:31 #: winefile.rc:37 winemine.rc:46 winhlp32.rc:34 wordpad.rc:37 @@ -8048,9 +8022,8 @@ msgid "E&xit" msgstr "S&alir" #: shell32.rc:127 -#, fuzzy msgid "&About Control Panel" -msgstr "&Acerca de Panel de Control..." +msgstr "&Acerca del Panel de Control" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -8062,7 +8035,7 @@ msgstr "Carpeta:" #: shell32.rc:296 msgid "&Make New Folder" -msgstr "&Hacer nueva carpeta" +msgstr "&Hacer una nueva carpeta" #: shell32.rc:303 msgid "Message" @@ -8154,7 +8127,6 @@ msgid "Date deleted" msgstr "Fecha de borrado" #: shell32.rc:153 winecfg.rc:92 winefile.rc:99 -#, fuzzy msgctxt "display name" msgid "Desktop" msgstr "Escritorio" @@ -8185,20 +8157,15 @@ msgstr "Apagar" #: shell32.rc:189 msgid "Do you want to shutdown your Wine session?" -msgstr "¿Desea terminar su sesión de Wine?" +msgstr "¿Desea cerrar su sesión de Wine?" #: shell32.rc:200 progman.rc:80 msgid "Programs" msgstr "Programas" #: shell32.rc:201 -#, fuzzy msgid "My Documents" -msgstr "" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Mis documentos\n" -"#-#-#-#-# es.po (Wine) #-#-#-#-#\n" -"Mis Documentos" +msgstr "Mis Documentos" #: shell32.rc:202 msgid "Favorites" @@ -8206,7 +8173,7 @@ msgstr "Favoritos" #: shell32.rc:203 msgid "StartUp" -msgstr "" +msgstr "Arranque" #: shell32.rc:204 msgid "Start Menu" @@ -8221,7 +8188,6 @@ msgid "My Videos" msgstr "Mis vídeos" #: shell32.rc:207 -#, fuzzy msgctxt "directory" msgid "Desktop" msgstr "Escritorio" @@ -8251,40 +8217,36 @@ msgid "My Pictures" msgstr "Mis imágenes" #: shell32.rc:215 -#, fuzzy msgid "Common Files" -msgstr "Copiando archivos..." +msgstr "Archivos comunes" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" msgstr "Documentos" #: shell32.rc:217 -#, fuzzy msgid "Administrative Tools" -msgstr "Menú Inicio\\Programas\\Accesorios\\Herramientas del sistema" +msgstr "Herramientas administrativas" #: shell32.rc:218 msgid "Music" -msgstr "Documentos\\Mi música" +msgstr "Música" #: shell32.rc:219 msgid "Pictures" -msgstr "Documentos\\Mis imágenes" +msgstr "Imágenes" #: shell32.rc:220 msgid "Videos" -msgstr "Documentos\\Mis vídeos" +msgstr "Vídeos" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Archivos de programa" +msgstr "Archivos de programa (x86)" #: shell32.rc:221 -#, fuzzy msgid "Contacts" -msgstr "&Contenido" +msgstr "Contactos" #: shell32.rc:222 winefile.rc:112 msgid "Links" @@ -8292,12 +8254,11 @@ msgstr "Enlaces" #: shell32.rc:223 msgid "Slide Shows" -msgstr "" +msgstr "Presentación de imágenes" #: shell32.rc:224 -#, fuzzy msgid "Playlists" -msgstr "&Reproducir" +msgstr "Listas de reproducción" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -8312,46 +8273,41 @@ msgid "Model" msgstr "Modelo" #: shell32.rc:225 -#, fuzzy msgid "Sample Music" -msgstr "Ejemplo" +msgstr "Música de prueba" #: shell32.rc:226 -#, fuzzy msgid "Sample Pictures" -msgstr "G&uardar imagen como..." +msgstr "Imágenes de prueba" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "" +msgstr "Listas de reproducción de prueba" #: shell32.rc:228 -#, fuzzy msgid "Sample Videos" -msgstr "Guardar &vídeo como..." +msgstr "Vídeos de prueba" #: shell32.rc:229 -#, fuzzy msgid "Saved Games" -msgstr "Guardar &como..." +msgstr "Juegos guardados" #: shell32.rc:230 #, fuzzy msgid "Searches" -msgstr "&Buscar" +msgstr "Búsquedas" #: shell32.rc:231 msgid "Users" -msgstr "" +msgstr "Usuarios" #: shell32.rc:233 -#, fuzzy msgid "Downloads" -msgstr "Descargando..." +msgstr "Descargas" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied." -msgstr "No se puede crear nueva carpeta: Permiso denegado." +msgstr "No se puede crear la nueva carpeta: Permiso denegado." #: shell32.rc:167 msgid "Error during creation of a new folder" @@ -8389,7 +8345,7 @@ msgstr "" #: shell32.rc:172 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "¿Seguro que desea eliminar el (los) elemento(s) seleccionado(s)?" +msgstr "¿Seguro que desea eliminar los elementos seleccionados?" #: shell32.rc:174 msgid "" @@ -8423,8 +8379,8 @@ msgstr "" "Esta carpeta ya contiene una carpeta llamada '%1'.\n" "\n" "Si los archivos de la carpeta de destino tienen los mismos nombres que los\n" -"de la carpeta seleccionada, éstos serán reemplazados. ¿Todavía desea mover\n" -"o copiar la carpeta?" +"de la carpeta seleccionada, éstos serán reemplazados. ¿Está seguro de que\n" +"desea mover o copiar la carpeta?" #: shell32.rc:235 msgid "New Folder" @@ -8453,47 +8409,42 @@ msgstr "" "No hay un programa de Windows configurado para abrir este tipo de archivo." #: shell32.rc:243 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "¿Seguro que desea eliminar '%1'?" +msgstr "¿Seguro que desea eliminar permanentemente '%1'?" #: shell32.rc:244 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "¿Seguro que desea eliminar estos %1 elementos?" +msgstr "¿Seguro que desea eliminar permanentemente estos %1 elementos?" #: shell32.rc:245 -#, fuzzy msgid "Confirm deletion" -msgstr "Confirmar eliminación de archivo" +msgstr "Confirme eliminación" #: shell32.rc:246 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"El archivo ya existe.\n" +"El archivo %1 ya existe en la ruta.\n" +"\n" "¿Desea reemplazarlo?" #: shell32.rc:247 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"El archivo ya existe.\n" -"¿Desea reemplazarlo?" +"La carpeta %1 ya existe en la ruta.\n" +"\n" +"¿Desea reemplazarla?" #: shell32.rc:248 -#, fuzzy msgid "Confirm overwrite" -msgstr "Confirmar sobreescritura de archivo" +msgstr "Confirme sobreescritura" #: shell32.rc:265 -#, fuzzy msgid "" "Wine is free software; you can redistribute it and/or modify it under the " "terms of the GNU Lesser General Public License as published by the Free " @@ -8509,22 +8460,18 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"start.exe versión 0.2 Copyright (C) 2003, Dan Kegel\n" -"This program is free software; you can redistribute it and/or\n" -"modify it under the terms of the GNU Lesser Public License\n" -"as published by the Free Software Foundation; either version 2.1\n" -"of the License, or (at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU Lesser Public License for more details.\n" +"Wine es software libre, puedes redistribuirlo y/o modificarlo bajo los " +"términos de la Licencia GNU Lesser General Public, o (a tu discreción) " +"cualquier versión posterior.\n" "\n" -"You should have received a copy of the GNU Lesser Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n" +"Wine es distribuido con la intención de ser útil, sin embargo viene SIN " +"NINGUNA GARANTÍA; incluso sin la garantía implícita de USABILIDAD O UTILIDAD " +"PARA UN FIN PARTICULAR. Lea la Licencia GNU Lesser General Public para más " +"detalles.\n" "\n" -"Mire el archivo COPYING.LIB para información sobre la licencia.\n" +"Usted debería haber recibido una copia de la Licencia GNU Lesser General " +"Public junto con Wine; sí no es así, escriba a la Free Software Foundation, " +"Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:253 msgid "Wine License"

1 0

Francois Gouget : po: Fix some typography issues in the Slovak translation.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 079f41822a9c1e1103e58d4180f6bd6f537b1a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079f41822a9c1e1103e58d418… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 15:00:06 2012 +0100 po: Fix some typography issues in the Slovak translation. --- po/sk.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/sk.po b/po/sk.po index 6760c40..b1e2914 100644 --- a/po/sk.po +++ b/po/sk.po @@ -437,7 +437,7 @@ msgstr "Vytlačiť &zadané strany" #: comdlg32.rc:206 comdlg32.rc:228 msgid "&Setup" -msgstr "&Nastaviť..." +msgstr "&Nastaviť" #: comdlg32.rc:207 msgid "&From:" @@ -754,7 +754,7 @@ msgstr "" #: comdlg32.rc:456 msgid "Look &in:" -msgstr "Hľadať &v" +msgstr "Hľadať &v:" #: comdlg32.rc:462 msgid "File &name:" @@ -762,7 +762,7 @@ msgstr "&Názov súboru:" #: comdlg32.rc:465 msgid "Files of &type:" -msgstr "&Typ súborov" +msgstr "&Typ súborov:" #: comdlg32.rc:468 msgid "Open as &read-only" @@ -770,7 +770,7 @@ msgstr "Otvo&riť iba na čítanie" #: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96 msgid "&Open" -msgstr "&Otvoriť..." +msgstr "&Otvoriť" #: comdlg32.rc:481 #, fuzzy @@ -958,23 +958,23 @@ msgstr "" #: comdlg32.rc:64 msgid "No default printer defined." -msgstr "Nie je nastavená implicitná tlačiareň" +msgstr "Nie je nastavená implicitná tlačiareň." #: comdlg32.rc:65 msgid "Cannot find the printer." -msgstr "Nemožno nájsť tlačiareň" +msgstr "Nemožno nájsť tlačiareň." #: comdlg32.rc:66 progman.rc:73 msgid "Out of memory." -msgstr "Nedostatok pamäte" +msgstr "Nedostatok pamäte." #: comdlg32.rc:67 msgid "An error occurred." -msgstr "Vyskytla sa chyba" +msgstr "Vyskytla sa chyba." #: comdlg32.rc:68 msgid "Unknown printer driver." -msgstr "Neznámy ovládač tlačiarne" +msgstr "Neznámy ovládač tlačiarne." #: comdlg32.rc:71 msgid ""

1 0

Ruei-Yuan Lu : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: a4c2f4b80c758f7ac2490848bc53c4b5265f235c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c2f4b80c758f7ac2490848b… Author: Ruei-Yuan Lu <rueiyuan.lu(a)gmail.com> Date: Fri Feb 24 22:03:38 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 1976 ++++++++++++++++++++++++----------------------------------- 1 files changed, 793 insertions(+), 1183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4c2f4b80c758f7ac2490…

1 0

Nikolay Sivov : msxml3/tests: Some tests for IMXAttributes::addAttribute().
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 8a0d86833e2c4b2953da4da8b9263df60d7d10bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0d86833e2c4b2953da4da8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 17:38:18 2012 +0300 msxml3/tests: Some tests for IMXAttributes::addAttribute(). --- dlls/msxml3/tests/saxreader.c | 137 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 129 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1f47062..c8f9bd1 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -327,7 +327,6 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( ISAXContentHandler* iface, ISAXLocator *pLocator) { - ISAXAttributes *attr, *attr1; HRESULT hr; if(!test_expect_call(CH_PUTDOCUMENTLOCATOR)) @@ -338,6 +337,9 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( msxml_version>=6 ? expectCall->column_v6 : expectCall->column); if(msxml_version >= 6) { + ISAXAttributes *attr, *attr1; + IMXAttributes *mxattr; + EXPECT_REF(pLocator, 1); hr = ISAXLocator_QueryInterface(pLocator, &IID_ISAXAttributes, (void**)&attr); EXPECT_HR(hr, S_OK); @@ -346,6 +348,10 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( EXPECT_HR(hr, S_OK); EXPECT_REF(pLocator, 3); ok(attr == attr1, "got %p, %p\n", attr, attr1); + + hr = ISAXAttributes_QueryInterface(attr, &IID_IMXAttributes, (void**)&mxattr); + EXPECT_HR(hr, E_NOINTERFACE); + ISAXAttributes_Release(attr); ISAXAttributes_Release(attr1); } @@ -1678,7 +1684,7 @@ struct msxmlsupported_data_t BOOL supported; }; -static struct msxmlsupported_data_t msxmlsupported_data[] = +static struct msxmlsupported_data_t mxwriter_support_data[] = { { &CLSID_MXXMLWriter, "MXXMLWriter" }, { &CLSID_MXXMLWriter30, "MXXMLWriter30" }, @@ -1687,7 +1693,16 @@ static struct msxmlsupported_data_t msxmlsupported_data[] = { NULL } }; -static BOOL is_mxwriter_supported(const GUID *clsid, const struct msxmlsupported_data_t *table) +static struct msxmlsupported_data_t mxattributes_support_data[] = +{ + { &CLSID_SAXAttributes, "SAXAttributes" }, + { &CLSID_SAXAttributes30, "SAXAttributes30" }, + { &CLSID_SAXAttributes40, "SAXAttributes40" }, + { &CLSID_SAXAttributes60, "SAXAttributes60" }, + { NULL } +}; + +static BOOL is_clsid_supported(const GUID *clsid, const struct msxmlsupported_data_t *table) { while (table->clsid) { @@ -1728,7 +1743,7 @@ static void test_mxwriter_default_properties(const struct mxwriter_props_t *tabl BSTR encoding; HRESULT hr; - if (!is_mxwriter_supported(table->clsid, msxmlsupported_data)) + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) { table++; i++; @@ -2205,7 +2220,7 @@ static const struct writer_startendelement_t writer_startendelement[] = { { NULL } }; -static void get_supported_mxwriter_data(struct msxmlsupported_data_t *table) +static void get_mxwriter_support_data(struct msxmlsupported_data_t *table) { while (table->clsid) { @@ -2223,6 +2238,24 @@ static void get_supported_mxwriter_data(struct msxmlsupported_data_t *table) } } +static void get_mxattributes_support_data(struct msxmlsupported_data_t *table) +{ + while (table->clsid) + { + IMXAttributes *attr; + HRESULT hr; + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXAttributes, (void**)&attr); + if (hr == S_OK) IMXAttributes_Release(attr); + + table->supported = hr == S_OK; + if (hr != S_OK) skip("class %s not supported\n", table->name); + + table++; + } +} + static void test_mxwriter_startendelement_batch(const struct writer_startendelement_t *table) { int i = 0; @@ -2233,7 +2266,7 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem IMXWriter *writer; HRESULT hr; - if (!is_mxwriter_supported(table->clsid, msxmlsupported_data)) + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) { table++; i++; @@ -3044,6 +3077,85 @@ static void test_mxwriter_dtd(void) free_bstrs(); } +typedef struct { + const CLSID *clsid; + const char *uri; + const char *local; + const char *qname; + const char *type; + const char *value; + HRESULT hr; +} addattribute_test_t; + +static const addattribute_test_t addattribute_data[] = { + { &CLSID_SAXAttributes, NULL, NULL, "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes30, NULL, NULL, "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes40, NULL, NULL, "ns:qname", NULL, "value", E_INVALIDARG }, + { &CLSID_SAXAttributes60, NULL, NULL, "ns:qname", NULL, "value", S_OK }, + { NULL } +}; + +static void test_mxattr_addAttribute(void) +{ + const addattribute_test_t *table = addattribute_data; + int i = 0; + + while (table->clsid) + { + ISAXAttributes *saxattr; + IMXAttributes *mxattr; + HRESULT hr; + int len; + + if (!is_clsid_supported(table->clsid, mxattributes_support_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXAttributes, (void**)&mxattr); + EXPECT_HR(hr, S_OK); + + hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); + EXPECT_HR(hr, S_OK); + + /* SAXAttributes30 and SAXAttributes60 both crash on this test */ + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getLength(saxattr, NULL); + EXPECT_HR(hr, E_POINTER); + } + + len = -1; + hr = ISAXAttributes_getLength(saxattr, &len); + EXPECT_HR(hr, S_OK); + ok(len == 0, "got %d\n", len); + + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), + _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); + ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + len = -1; + hr = ISAXAttributes_getLength(saxattr, &len); + EXPECT_HR(hr, S_OK); + if (table->hr == S_OK) + ok(len == 1, "%d: got %d length, expected 0\n", i, len); + else + ok(len == 0, "%d: got %d length, expected 1\n", i, len); + + ISAXAttributes_Release(saxattr); + IMXAttributes_Release(mxattr); + + table++; + i++; + } + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -3072,8 +3184,8 @@ START_TEST(saxreader) test_dispex(); /* MXXMLWriter tests */ - get_supported_mxwriter_data(msxmlsupported_data); - if (is_mxwriter_supported(&CLSID_MXXMLWriter, msxmlsupported_data)) + get_mxwriter_support_data(mxwriter_support_data); + if (is_clsid_supported(&CLSID_MXXMLWriter, mxwriter_support_data)) { test_mxwriter_handlers(); test_mxwriter_startenddocument(); @@ -3091,5 +3203,14 @@ START_TEST(saxreader) else win_skip("MXXMLWriter not supported\n"); + /* SAXAttributes tests */ + get_mxattributes_support_data(mxattributes_support_data); + if (is_clsid_supported(&CLSID_SAXAttributes, mxattributes_support_data)) + { + test_mxattr_addAttribute(); + } + else + skip("SAXAttributes not supported\n"); + CoUninitialize(); }

1 0

Jörg Höhle : mmdevapi/tests: Fix some render test failures.
by Alexandre Julliard Feb. 24, 2012

Feb. 24, 2012

Module: wine Branch: master Commit: 813d0432a9e8eedf6340498d3b7eb933f5520d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=813d0432a9e8eedf6340498d3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 21 18:35:05 2012 +0100 mmdevapi/tests: Fix some render test failures. --- dlls/mmdevapi/tests/render.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 127f558..0552183 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -334,6 +334,7 @@ static void test_audioclient(void) (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + /* Native appears to add the engine period to the HW latency in shared mode */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -681,7 +682,7 @@ static void test_padding(void) IAudioClient *ac; IAudioRenderClient *arc; WAVEFORMATEX *pwfx; - REFERENCE_TIME minp, defp, lat; + REFERENCE_TIME minp, defp; BYTE *buf; UINT32 psize, pad, written; @@ -715,11 +716,6 @@ static void test_padding(void) ok(minp != 0, "Minimum period is 0\n"); ok(minp <= defp, "Mininum period is greater than default period\n"); - hr = IAudioClient_GetStreamLatency(ac, &lat); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); - ok(lat >= defp, "Latency is at least period in shared mode\n"); - /* Native appears to add the engine period to the HW latency in shared mode */ - hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -898,13 +894,14 @@ static void test_clock(int share) } /** GetStreamLatency - * Shared mode: 1x period + a little + * Shared mode: 1x period + a little, but some 192000 devices return 5.3334ms. * Exclusive mode: testbot returns 2x period + a little, but * some HDA drivers return 1x period, some + a little. */ hr = IAudioClient_GetStreamLatency(ac, &t2); ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= period, "Latency < default period, delta %ldus\n", (long)((t2-period)/10)); + ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000), + "Latency < default period, delta %ldus\n", (long)((t2-period)/10)); /** GetBufferSize * BufferSize must be rounded up, maximum 2s says MSDN. @@ -929,7 +926,7 @@ static void test_clock(int share) ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); else todo_wine - ok(gbsize == parts * fragment, + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of @@ -1860,13 +1857,19 @@ static void test_volume_dependence(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); - if(SUCCEEDED(hr)){ - IChannelAudioVolume *cav2; - IAudioStreamVolume *asv2; + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr == S_OK){ hr = IAudioClient_Initialize(ac2, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + IAudioClient_Release(ac2); + } + + if(hr == S_OK){ + IChannelAudioVolume *cav2; + IAudioStreamVolume *asv2; hr = IAudioClient_GetService(ac2, &IID_IChannelAudioVolume, (void**)&cav2); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -2097,8 +2100,8 @@ static void test_worst_case(void) ok(hr == S_OK, "Start failed: %08x\n", hr); for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ - r = WaitForSingleObject(event, 70); - ok(r == WAIT_OBJECT_0, "Wait gave %x\n", r); + r = WaitForSingleObject(event, 60 + defp / 10000); + ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %x\n", i, r); /* the app has nearly one period time to feed data */ Sleep((i % 10) * defp / 120000);

1 0

Zoltan Nagy : po: Update Hungarian translation.
by Alexandre Julliard Feb. 23, 2012

Feb. 23, 2012

Module: wine Branch: master Commit: 97ef216367a447c1ce9fa03199f334fe125d0942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ef216367a447c1ce9fa0319… Author: Zoltan Nagy <e-sw(a)freemail.hu> Date: Thu Feb 23 19:56:44 2012 +0100 po: Update Hungarian translation. --- po/hu.po | 273 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 115 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97ef216367a447c1ce9fa…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Feb. 23, 2012

Feb. 23, 2012

Module: wine Branch: master Commit: 07c1a8287ef3b177f5bdd83909f642a22effdc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c1a8287ef3b177f5bdd8390… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Feb 23 09:55:15 2012 +0100 po: Update Italian translation. --- po/it.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/it.po b/po/it.po index 4c07c8c..a51f06b 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-17 10:25+0100\n" +"PO-Revision-Date: 2012-02-23 09:53+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -6690,7 +6690,7 @@ msgstr "" "\n" "Installa un prodotto:\n" "\t/i {pacchetto|codice_prodotto} [proprietà]\n" -"\t/pacchetto {pacchetto|codice_prodotto} [proprietà]\n" +"\t/package {pacchetto|codice_prodotto} [proprietà]\n" "\t/a pacchetto [proprietà]\n" "Ripara un'installazione:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {pacchetto|codice_prodotto}\n" @@ -9643,7 +9643,7 @@ msgid "" msgstr "" "Avvia un programma, o apri un documento con il programma normalmente usato " "per i file con quell'estensione.\n" -"Usage:\n" +"Uso:\n" "start [opzioni] nome_programma [...]\n" "start [opzioni] nome_documento\n" "\n" @@ -11486,7 +11486,7 @@ msgid "" msgstr "" "Avvia un programma, o apri un documento con il programma normalmente usato " "per i file con quell'estensione.\n" -"Usage:\n" +"Uso:\n" "start [opzioni] nome_programma [...]\n" "start [opzioni] nome_documento\n" "\n" @@ -11503,11 +11503,10 @@ msgstr "" "/? Mostra questo aiuto ed esci.\n" "\n" "start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start è fornito SENZA GARANZIA di alcun tipo; per ulteriori informazioni " +"Start è fornito SENZA GARANZIA di alcun tipo; per ulteriori informazioni\n" "eseguire start con l'opzione /L.\n" -"Questo è software libero e sei invitato a redistribuirlo sotto alcune " -"condizioni;\n" -" eseguire 'start' con l'opzione /L per ulteriori informazioni.\n" +"Questo è software libero e sei invitato a redistribuirlo sotto alcune\n" +"condizioni; eseguire 'start' con l'opzione /L per ulteriori informazioni.\n" #: start.rc:64 msgid ""

1 0