May 2011 - Wine-commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 02c5134029e067a34ac6d07ead07bc464be80f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c5134029e067a34ac6d07ea… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed May 18 19:34:34 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7c237cb..ae49195 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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: 2011-05-03 21:49+0300\n" +"PO-Revision-Date: 2011-05-19 22:50+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6843,13 +6843,12 @@ msgid "&About Wine" msgstr "Apie &Wine" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl-F4" -msgstr "&Užverti\tAlt-F4" +msgstr "&Užverti\tVald-F4" #: user32.rc:48 msgid "Nex&t\tCtrl-F6" -msgstr "" +msgstr "Ki&tas\tVald-F6" #: user32.rc:68 regedit.rc:176 winefile.rc:100 msgid "Error" @@ -8387,7 +8386,7 @@ msgstr "" #: cmd.rc:283 msgid "Volume label (11 characters, ENTER for none)?" -msgstr "Tomo vardas (11 simbolių, ENTER - bevardis)?" +msgstr "Tomo vardas (11 simbolių, ĮVESTI – bevardis)?" #: cmd.rc:284 msgid "PATH not found\n" @@ -8774,9 +8773,8 @@ msgid "&View TypeLib..." msgstr "&Peržiūrėti TypeLib..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "&Sistemos konfigūracija..." +msgstr "&Sistemos konfigūracija" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9049,7 +9047,7 @@ msgstr "&Nauja..." #: progman.rc:31 msgid "O&pen\tEnter" -msgstr "&Atverti\tEnter" +msgstr "&Atverti\tĮvesti" #: progman.rc:32 winefile.rc:27 msgid "&Move...\tF7" @@ -9060,18 +9058,16 @@ msgid "&Copy...\tF8" msgstr "&Kopijuoti...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "Savy&bės\tAlt+Enter" +msgstr "Savy&bės\tAlt+Įvesti" #: progman.rc:37 msgid "&Execute..." msgstr "&Vykdyti..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" -msgstr "Iš&eiti..." +msgstr "Iš&eiti" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options" @@ -10779,7 +10775,7 @@ msgstr "(nenustatytas)" #: winefile.rc:26 msgid "&Open\tEnter" -msgstr "&Atverti\tEnter" +msgstr "&Atverti\tĮvesti" #: winefile.rc:30 msgid "Re&name..." @@ -10787,7 +10783,7 @@ msgstr "Per&vadinti..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "Savy&bės\tAlt+Enter" +msgstr "Savy&bės\tAlt+Įvesti" #: winefile.rc:33 msgid "&Run..." @@ -11339,7 +11335,7 @@ msgstr "Neteisingas parametras „%s“ - pagalba: xcopy /?\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" -msgstr "Spauskite <enter> kopijavimui pradėti\n" +msgstr "Spauskite <įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 msgid "%d file(s) would be copied\n"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 9298d9767725522b90dbb3f0045b470cb4f22d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9298d9767725522b90dbb3f00… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 19 23:37:01 2011 +0200 po: Update French translation. --- po/fr.po | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index d1a148d..1463345 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8834,9 +8834,8 @@ msgid "&View TypeLib..." msgstr "&Afficher une TypeLib..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "&Configuration système..." +msgstr "&Configuration système" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9128,7 +9127,6 @@ msgid "&Copy...\tF8" msgstr "C&opier...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" msgstr "&Propriétés\tAlt+Entrée" @@ -9137,7 +9135,6 @@ msgid "&Execute..." msgstr "E&xécuter..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" msgstr "&Quitter Windows..."

1 0

Stefan Dösinger : d3d9: Account for another different behavior in the viewport test.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 803bad09592c8b57a9bec3ac2661ce7c9067a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=803bad09592c8b57a9bec3ac2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 30 22:18:31 2011 +0100 d3d9: Account for another different behavior in the viewport test. --- dlls/d3d9/tests/visual.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 439b5cc..ffee8de 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10394,9 +10394,15 @@ static void viewport_test(IDirect3DDevice9 *device) { * TODO: Test Width < surface.width, but X + Width > surface.width * TODO: Test Width < surface.width, what happens with the height? * - * Note that Windows 7 rejects MinZ / MaxZ outside [0;1], but accepts Width - * and Height fields bigger than the framebuffer. However, it later refuses - * to draw. + * The expected behavior is that the viewport behaves like the "default" + * viewport with X = Y = 0, Width = surface_width, Height = surface_height, + * MinZ = 0.0, MaxZ = 1.0. + * + * Starting with Windows 7 the behavior among driver versions is not + * consistent. The SetViewport call is accepted on all drivers. Some + * drivers(older nvidia ones) refuse to draw and return an error. Newer + * nvidia drivers draw, but use the actual values in the viewport and only + * display the upper left part on the surface. */ memset(&vp, 0, sizeof(vp)); vp.X = 0; @@ -10430,10 +10436,10 @@ static void viewport_test(IDirect3DDevice9 *device) { color = getPixelColor(device, 158, 122); ok(color == 0x00ff0000, "viewport test: (158,122) has color %08x\n", color); color = getPixelColor(device, 162, 122); - ok(color == 0x00ffffff, "viewport test: (162,122) has color %08x\n", color); + ok(color == 0x00ffffff || broken(color == 0x00ff0000), "viewport test: (162,122) has color %08x\n", color); color = getPixelColor(device, 478, 358); - ok(color == 0x00ffffff, "viewport test: (478,358 has color %08x\n", color); + ok(color == 0x00ffffff || broken(color == 0x00ff0000), "viewport test: (478,358 has color %08x\n", color); color = getPixelColor(device, 482, 358); ok(color == 0x00ff0000, "viewport test: (482,358) has color %08x\n", color); color = getPixelColor(device, 478, 362);

1 0

Stefan Dösinger : d3d9: Skip the YUV tests when the driver confuses the U and V channels.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 77c1454cf60cd03a1498323b36bddf25abe45318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c1454cf60cd03a1498323b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 30 22:19:02 2011 +0100 d3d9: Skip the YUV tests when the driver confuses the U and V channels. --- dlls/d3d9/tests/visual.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ffee8de..f3ba3b4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9713,6 +9713,17 @@ static void yuv_color_test(IDirect3DDevice9 *device) { * differently, so we need a max diff of 16 */ color = getPixelColor(device, 40, 240); + + /* Newer versions of the Nvidia Windows driver mix up the U and V channels, breaking all the tests + * where U != V. Skip the entire test if this bug in this case + */ + if (broken(test_data[i].in == 0xff000000 && color == 0x00008800 && format == D3DFMT_UYVY)) + { + skip("Nvidia channel confusion bug detected, skipping YUV tests\n"); + IDirect3DSurface9_Release(surface); + goto out; + } + ok(color_match(color, ref_color_left, 18), "Input 0x%08x: Got color 0x%08x for pixel 1/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_left, fmt_string); @@ -9725,6 +9736,8 @@ static void yuv_color_test(IDirect3DDevice9 *device) { } IDirect3DSurface9_Release(surface); } + +out: IDirect3DSurface9_Release(target); IDirect3D9_Release(d3d); }

1 0

Dylan Smith : d3dx9/tests: Fix a normal comparison for triangles with zero area.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 147e1200495bd947775f6873d420a46d218caa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147e1200495bd947775f6873d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 18:35:02 2011 -0400 d3dx9/tests: Fix a normal comparison for triangles with zero area. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 5367745..c8853cd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2785,7 +2785,7 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str D3DXVec3Subtract(&v2, vtx3, vtx2); D3DXVec3Cross(&normal, &v1, &v2); D3DXVec3Normalize(&normal, &normal); - ok(compare_vec3(normal, forward), + ok(!D3DXVec3Length(&normal) || compare_vec3(normal, forward), "Test %s, glyph %d, face %d normal, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, face_idx1, normal.x, normal.y, normal.z, forward.x, forward.y, forward.z); }

1 0

Dylan Smith : d3dxof: Remove assumption of 4 bytes pointers for LPSTR value .
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 0857d2b26bb4bd831cd1ee2de2586e6248c06d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0857d2b26bb4bd831cd1ee2de… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 18:35:17 2011 -0400 d3dxof: Remove assumption of 4 bytes pointers for LPSTR value. --- dlls/d3dxof/parsing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c3bfba0..417194b 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1140,7 +1140,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); - if (!check_buffer(buf, 4)) + if (!check_buffer(buf, sizeof(LPSTR))) return FALSE; if (pt->members[i].type == TOKEN_LPSTR) { @@ -1153,7 +1153,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) strcpy((char*)buf->cur_pstrings, (char*)buf->value); *(((LPCSTR*)(buf->cur_pos_data + buf->pdata))) = (char*)buf->cur_pstrings; buf->cur_pstrings += len; - buf->cur_pos_data += 4; + buf->cur_pos_data += sizeof(LPSTR); } else {

1 0

Gerald Pfeifer : wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: be57450fee3cbe57300630bbc4b7b80d969c8144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be57450fee3cbe57300630bbc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 19 08:24:23 2011 -0600 wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include "audiopolicy.h" #include "audioclient.h" + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

1 0

Alexandre Julliard : services: Add a helper function to send a command to the service.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 0c1c1fc20db69fd6bfb7dae70de5f9e9793d5c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1c1fc20db69fd6bfb7dae70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 11:49:02 2011 +0200 services: Add a helper function to send a command to the service. --- programs/services/rpc.c | 39 ++++++++++++++++++++++++++++----------- programs/services/services.c | 14 +++++--------- programs/services/services.h | 2 ++ 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index cf1f814..d1dd39e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -888,12 +888,37 @@ static BOOL service_accepts_control(const struct service_entry *service, DWORD d } /****************************************************************************** + * service_send_command + */ +BOOL service_send_command( struct service_entry *service, HANDLE pipe, + const void *data, DWORD size, DWORD *result ) +{ + DWORD count; + BOOL r; + + r = WriteFile(pipe, data, size, &count, NULL); + if (!r || count != size) + { + WINE_ERR("service protocol error - failed to write pipe!\n"); + return FALSE; + } + r = ReadFile(pipe, result, sizeof *result, &count, NULL); + if (!r || count != sizeof *result) + { + WINE_ERR("service protocol error - failed to read pipe " + "r = %d count = %d!\n", r, count); + return FALSE; + } + return r; +} + +/****************************************************************************** * service_send_control */ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWORD dwControl, DWORD *result) { service_start_info *ssi; - DWORD len, count = 0; + DWORD len; BOOL r; /* calculate how much space we need to send the startup info */ @@ -906,16 +931,8 @@ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWO ssi->name_size = strlenW(service->name) + 1; strcpyW( ssi->data, service->name ); - r = WriteFile(pipe, ssi, ssi->total_size, &count, NULL); - if (!r || count != ssi->total_size) - { - WINE_ERR("service protocol error - failed to write pipe!\n"); - return r; - } - r = ReadFile(pipe, result, sizeof *result, &count, NULL); - if (!r || count != sizeof *result) - WINE_ERR("service protocol error - failed to read pipe " - "r = %d count = %d!\n", r, count); + r = service_send_command( service, pipe, ssi, ssi->total_size, result ); + HeapFree( GetProcessHeap(), 0, ssi ); return r; } diff --git a/programs/services/services.c b/programs/services/services.c index 5d0e4be..b3ed1a3 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -671,7 +671,7 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL */ static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *argv, DWORD argc) { - DWORD i, len, count, result; + DWORD i, len, result; service_start_info *ssi; LPWSTR p; BOOL r; @@ -708,15 +708,11 @@ static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *a } *p=0; - r = WriteFile(service->control_pipe, ssi, ssi->total_size, &count, NULL); - if (r) + r = service_send_command( service, service->control_pipe, ssi, ssi->total_size, &result ); + if (r && result) { - r = ReadFile(service->control_pipe, &result, sizeof result, &count, NULL); - if (r && result) - { - SetLastError(result); - r = FALSE; - } + SetLastError(result); + r = FALSE; } HeapFree(GetProcessHeap(),0,ssi); diff --git a/programs/services/services.h b/programs/services/services.h index cd7de02..ea917f4 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -75,6 +75,8 @@ void service_lock_shared(struct service_entry *service); void service_lock_exclusive(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); +BOOL service_send_command( struct service_entry *service, HANDLE pipe, + const void *data, DWORD size, DWORD *result ); extern HANDLE g_hStartedEvent;

1 0

Thomas Mullaly : mshtml: Added support for IDispatch Html document events.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: cd69836d54e7f4fe4fb4d36abe5ffe638b8c7b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd69836d54e7f4fe4fb4d36ab… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Wed May 11 17:15:10 2011 -0400 mshtml: Added support for IDispatch Html document events. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/tests/events.c | 10 +++++----- dlls/mshtml/tests/htmldoc.c | 22 ++++++++++++++++------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f7a70ca..6ecb39b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1866,7 +1866,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) HTMLDocument_Hlink_Init(doc); ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface); - ConnectionPoint_Init(&doc->cp_dispatch, &doc->cp_container, &IID_IDispatch, NULL); + ConnectionPoint_Init(&doc->cp_dispatch, &doc->cp_container, &IID_IDispatch, &HTMLDocumentEvents_data); ConnectionPoint_Init(&doc->cp_propnotif, &doc->cp_container, &IID_IPropertyNotifySink, NULL); ConnectionPoint_Init(&doc->cp_htmldocevents, &doc->cp_container, &DIID_HTMLDocumentEvents, &HTMLDocumentEvents_data); ConnectionPoint_Init(&doc->cp_htmldocevents2, &doc->cp_container, &DIID_HTMLDocumentEvents2, NULL); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 212f0a1..fa2fb6f 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1460,7 +1460,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); - todo_wine CHECK_CALLED(invoke_onclick); + CHECK_CALLED(invoke_onclick); } xy_todo = TRUE; @@ -1478,7 +1478,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); - todo_wine CHECK_CALLED(invoke_onclick); + CHECK_CALLED(invoke_onclick); SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); @@ -1493,7 +1493,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); - todo_wine CHECK_CALLED(invoke_onclick); + CHECK_CALLED(invoke_onclick); cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); @@ -1518,7 +1518,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); - todo_wine CHECK_CALLED(invoke_onclick); + CHECK_CALLED(invoke_onclick); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); @@ -1546,7 +1546,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); - todo_wine CHECK_CALLED(invoke_onclick); + CHECK_CALLED(invoke_onclick); IHTMLElement_Release(div); IHTMLElement_Release(body); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index aa8c43b..f22bdbd 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -74,6 +74,12 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + #define CHECK_CALLED_BROKEN(func) \ do { \ ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ @@ -4014,7 +4020,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) container_locked = TRUE; } CHECK_CALLED(OnChanged_READYSTATE); - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); SET_CALLED(IsSystemMoniker); /* IE7 */ SET_CALLED(Exec_ShellDocView_84); if(mon == &Moniker) @@ -4145,8 +4151,8 @@ static void test_download(DWORD flags) CHECK_CALLED(UnlockRequest); } if(!(flags & DWL_EMPTY)) - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Interactive); - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Complete); + CHECK_CALLED(Invoke_OnReadyStateChange_Interactive); + CHECK_CALLED(Invoke_OnReadyStateChange_Complete); SET_CALLED(Exec_Explorer_69); SET_CALLED(EnableModeless_TRUE); /* IE7 */ SET_CALLED(Frame_EnableModeless_TRUE); /* IE7 */ @@ -4616,7 +4622,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(OnChanged_READYSTATE); - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); SET_CALLED(IsSystemMoniker); /* IE7 */ SET_CALLED(Exec_ShellDocView_84); if(loaded) @@ -5309,7 +5315,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); CHECK_CALLED(OnChanged_READYSTATE); - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); CHECK_CALLED(Read); todo_wine CHECK_CALLED(GetPendingUrl); @@ -5344,7 +5350,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); CHECK_CALLED(OnChanged_READYSTATE); - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); todo_wine CHECK_CALLED(GetPendingUrl); test_timer(EXPECT_SETTITLE); @@ -5805,7 +5811,11 @@ static void test_HTMLDocument_StreamInitNew(void) test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_StreamInitNew(doc); + + SET_EXPECT(Invoke_OnReadyStateChange_Interactive); test_download(DWL_VERBDONE|DWL_TRYCSS|DWL_EMPTY); + todo_wine CHECK_NOT_CALLED(Invoke_OnReadyStateChange_Interactive); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_UIDeactivate();

1 0

Thomas Mullaly : urlmon: Prevent putting garbage data into TRACE.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: baf036d5385b995166a1e05e8f34ffdef93971cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf036d5385b995166a1e05e8… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Thu May 19 15:05:39 2011 -0400 urlmon: Prevent putting garbage data into TRACE. --- dlls/urlmon/uri.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 459d4c4..f12f826 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3144,8 +3144,9 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->path_len = uri->canon_len - uri->path_start; - TRACE("(%p %p %x %d): Canonicalized opaque URI path %s len=%d\n", data, uri, flags, computeOnly, - debugstr_wn(uri->canon_uri+uri->path_start, uri->path_len), uri->path_len); + if(!computeOnly) + TRACE("(%p %p %x %d): Canonicalized opaque URI path %s len=%d\n", data, uri, flags, computeOnly, + debugstr_wn(uri->canon_uri+uri->path_start, uri->path_len), uri->path_len); return TRUE; }

1 0