November 2010 - Wine-Devel - list.winehq.org

Re: [2/11] update Simplified Chinese translation: notepad
by Paul Vriens Nov. 12, 2010

Nov. 12, 2010

On 11/12/2010 02:26 PM, cheer_xiao wrote: > Here is my update for the Simplified Chinese translation. I have "make"d > all corresponding files to ensure that they don't get broken. Copyright > info has been included (if not present). > > > > Hi, Most of your emails don't contain the actual patches. -- Cheers, Paul.

1 0

Re: [PATCH 1/4] shdocvw: Implement DocHostUIHandler::TranslateAccelerator.
by Jacek Caban Nov. 12, 2010

Nov. 12, 2010

Hi David, On 11/12/10 8:49 AM, David Hedberg wrote: > --- > dlls/shdocvw/dochost.c | 9 +- > dlls/shdocvw/tests/webbrowser.c | 251 ++++++++++++++++++++++++++++++++++++++- > 2 files changed, 253 insertions(+), 7 deletions(-) > > diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c > index babfe11..fd1c7f8 100644 > --- a/dlls/shdocvw/tests/webbrowser.c > +++ b/dlls/shdocvw/tests/webbrowser.c > @@ -122,8 +122,12 @@ DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); > DEFINE_EXPECT(QueryStatus_STOP); > DEFINE_EXPECT(DocHost_EnableModeless_TRUE); > DEFINE_EXPECT(DocHost_EnableModeless_FALSE); > +DEFINE_EXPECT(DocHost_TranslateAccelerator); > DEFINE_EXPECT(GetDropTarget); > DEFINE_EXPECT(TranslateUrl); > +DEFINE_EXPECT(ShowUI); > +DEFINE_EXPECT(HideUI); > +DEFINE_EXPECT(RequestUIActivate); > > static const WCHAR wszItem[] = {'i','t','e','m',0}; > static const WCHAR emptyW[] = {0}; > @@ -133,6 +137,7 @@ static IWebBrowser2 *wb; > > static HWND container_hwnd, shell_embedding_hwnd; > static BOOL is_downloading, is_first_load; > +static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; > static const char *current_url; > > #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 > @@ -249,6 +254,10 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID > { > if(!pguidCmdGroup) { > switch(nCmdID) { > + case OLECMDID_UPDATECOMMANDS: > + ok(nCmdexecopt == 2, "nCmdexecopts=%08x\n", nCmdexecopt); > + ok(pvaIn == NULL, "Got non-null pvaIn\n"); > + break; This should also use CHECK_EXPECT() > case OLECMDID_SETPROGRESSMAX: > CHECK_EXPECT2(Exec_SETPROGRESSMAX); > ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); > @@ -1128,7 +1137,7 @@ static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *iface > > static HRESULT WINAPI InPlaceSite_RequestUIActivate(IOleInPlaceSiteEx *iface) > { > - ok(0, "unexpected call\n"); > + CHECK_EXPECT2(RequestUIActivate); > return S_OK; > } > > @@ -1195,13 +1204,13 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d > IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, > IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) > { > - ok(0, "unexpected call\n"); > + CHECK_EXPECT(ShowUI); > return E_NOTIMPL; > } > > static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) > { > - ok(0, "unexpected call\n"); > + CHECK_EXPECT(HideUI); > return E_NOTIMPL; > } > > @@ -1243,8 +1252,12 @@ static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, L > static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *iface, LPMSG lpMsg, > const GUID *pguidCmdGroup, DWORD nCmdID) > { > - ok(0, "unexpected call\n"); > - return E_NOTIMPL; > + CHECK_EXPECT(DocHost_TranslateAccelerator); > + ok(pguidCmdGroup != NULL, "Got NULL pguidCmdGroup.\n"); > + if(pguidCmdGroup) > + ok(IsEqualGUID(pguidCmdGroup,&CGID_MSHTML), "Unexpected pguidCmdGroup\n"); > + ok(lpMsg != NULL, "Got NULL lpMsg.\n"); > + return hr_dochost_TranslateAccelerator; > } > > static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, > @@ -2483,6 +2496,233 @@ static void test_QueryInterface(IUnknown *unk) > > } > > +static void translate_messages(void) > +{ > + MSG msg; > + UINT i; > + for(i = 0; i< 100; i++) { > + while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { > + TranslateMessage(&msg); > + DispatchMessage(&msg); > + } > + Sleep(5); > + } > +} > +static void test_TranslateAccelerator(IUnknown *unk) > +{ > + IWebBrowser2 *pwb2; > + IOleObject *pobj; > + HRESULT hr; > + DWORD keycode; > + IDispatch *disp_html; > + VARIANT url; > + MSG msg_a = { > + container_hwnd, > + 0, 0, 0, > + GetTickCount(), > + {5, 5} > + }; > + > + is_downloading = TRUE; > + > + hr = IUnknown_QueryInterface(unk,&IID_IWebBrowser2, (void**)&pwb2); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(FAILED(hr)) { > + skip("Failed to get IWebBrowser2\n"); /* This should never happen */ > + return; > + } > + > + disp_html = (void*)0xdeadbeef; > + hr = IWebBrowser2_get_Document(pwb2,&disp_html); > + todo_wine ok(hr == S_FALSE || broken(hr == S_OK) /*< IE7 */, "Got 0x%08x\n", hr); > + ok(disp_html == NULL, "Received doc.\n"); > + if(disp_html != NULL) > + IDispatch_Release(disp_html); > + > + /* Activate */ > + SET_EXPECT(GetContainer); > + SET_EXPECT(Site_GetWindow); > + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); > + SET_EXPECT(Invoke_AMBIENT_SILENT); > + > + hr = IUnknown_QueryInterface(unk,&IID_IOleObject, (void**)&pobj); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + hr = IOleObject_SetClientSite(pobj,&ClientSite); > + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); > + > + IOleObject_Release(pobj); > + } > + > + CHECK_CALLED(GetContainer); > + CHECK_CALLED(Site_GetWindow); > + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); > + CHECK_CALLED(Invoke_AMBIENT_SILENT); Please use test_ClientSite here. If for some reason you want to avoid its additional tests, simply add a flag argument to it. > + SET_EXPECT(Invoke_AMBIENT_USERMODE); > + SET_EXPECT(Exec_SETDOWNLOADSTATE_1); > + SET_EXPECT(GetHostInfo); > + SET_EXPECT(Invoke_AMBIENT_DLCONTROL); > + SET_EXPECT(Invoke_AMBIENT_USERAGENT); > + SET_EXPECT(Invoke_AMBIENT_PALETTE); > + SET_EXPECT(GetOptionKeyPath); > + SET_EXPECT(GetOverridesKeyPath); > + SET_EXPECT(QueryStatus_SETPROGRESSTEXT); > + SET_EXPECT(Exec_SETPROGRESSMAX); > + SET_EXPECT(Exec_SETPROGRESSPOS); > + SET_EXPECT(Exec_SETDOWNLOADSTATE_0); > + SET_EXPECT(DocHost_EnableModeless_FALSE); > + SET_EXPECT(DocHost_EnableModeless_TRUE); > + > + SET_EXPECT(UpdateUI); /* Wine */ > + > + V_VT(&url) = VT_BSTR; > + V_BSTR(&url) = a2bstr("about:blank"); > + current_url = "about:blank"; > + hr = IWebBrowser2_Navigate2(pwb2,&url, NULL, NULL, NULL, NULL); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + > + translate_messages(); Use test_Navigate2 here. > + > + todo_wine ok(expect_UpdateUI, "UpdateUI called.\n"); > + CLEAR_CALLED(UpdateUI); This is not the right way to deal with it. I have a proper fix for test failures on Windows that should help here. I need to make it work on Wine before sending. I will try to send it today. > + > + CHECK_CALLED(Invoke_AMBIENT_USERMODE); > + todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); > + CHECK_CALLED(GetHostInfo); > + CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); > + CHECK_CALLED(Invoke_AMBIENT_USERAGENT); > + CHECK_CALLED(Invoke_AMBIENT_PALETTE); > + CHECK_CALLED(GetOptionKeyPath); > + CHECK_CALLED(GetOverridesKeyPath); > + todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); > + todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); > + todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); > + > + /* Set the document */ > + hr = IWebBrowser2_get_Document(pwb2,&disp_html); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + ok(disp_html != NULL, "Got %p\n", disp_html); > + if(SUCCEEDED(hr)) { > + IHTMLDocument2 *doc_html; > + > + hr = IDispatch_QueryInterface(disp_html,&IID_IHTMLDocument2, (void**)&doc_html); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + IOleDocumentView *odc_view; > + > + hr = IHTMLDocument2_QueryInterface(doc_html,&IID_IOleDocumentView, (void**)&odc_view); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + SET_EXPECT(Exec_SETPROGRESSMAX); > + SET_EXPECT(Exec_SETDOWNLOADSTATE_0); > + SET_EXPECT(Exec_SETDOWNLOADSTATE_1); > + SET_EXPECT(RequestUIActivate); > + SET_EXPECT(ShowUI); > + SET_EXPECT(HideUI); > + SET_EXPECT(GetDropTarget); > + SET_EXPECT(UpdateUI); > + SET_EXPECT(QueryStatus_STOP); > + > + hr = IOleDocumentView_UIActivate(odc_view, TRUE); > + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); > + > + translate_messages(); > + > + todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); > + todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); > + todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); > + todo_wine CHECK_CALLED(RequestUIActivate); > + todo_wine CHECK_CALLED(ShowUI); > + todo_wine CHECK_CALLED(HideUI); > + todo_wine CHECK_CALLED(GetDropTarget); > + CHECK_CALLED(UpdateUI); > + todo_wine CHECK_CALLED(QueryStatus_STOP); > + > + IOleDocumentView_Release(odc_view); > + } > + IHTMLDocument2_Release(doc_html); > + } > + IDispatch_Release(disp_html); > + } > + > + /* Call shdocvw _TranslateAccelerators from the other side */ > + disp_html = (void*)0xdeadbeef; > + hr = IWebBrowser2_get_Document(pwb2,&disp_html); > + ok(hr == S_OK, "Got 0x%08x\n", hr); Use get_document helper function. > + ok(disp_html != NULL, "Got %p\n", disp_html); > + if(SUCCEEDED(hr)) { > + IHTMLDocument2 *doc_html; > + hr = IDispatch_QueryInterface(disp_html,&IID_IHTMLDocument2, (void**)&doc_html); > + ok(hr == S_OK, "Got 0x%08x\n", hr); You don't need it. > + if(SUCCEEDED(hr)) { > + IOleObject *html_obj; > + hr = IHTMLDocument2_QueryInterface(doc_html,&IID_IOleObject, (void**)&html_obj); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + IOleClientSite *the_site; > + > + hr = IOleObject_GetClientSite(html_obj,&the_site); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + IDocHostUIHandler2 *html_dochost; > + IUnknown *punk_test; > + > + hr = IOleClientSite_QueryInterface(the_site,&IID_IOleInPlaceFrame, (void**)&punk_test); > + ok(hr == E_NOINTERFACE, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) IUnknown_Release(punk_test); > + > + hr = IOleClientSite_QueryInterface(the_site,&IID_IDocHostShowUI, (void**)&punk_test); > + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) IUnknown_Release(punk_test); > + > + hr = IOleClientSite_QueryInterface(the_site,&IID_IDocHostUIHandler, (void**)&punk_test); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) IUnknown_Release(punk_test); > + > + hr = IOleClientSite_QueryInterface(the_site,&IID_IDocHostUIHandler2, (void**)&html_dochost); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + > + msg_a.message = WM_KEYDOWN; > + hr_dochost_TranslateAccelerator = 0xdeadbeef; > + for(keycode = 0; keycode<= 0x100; keycode++) { > + msg_a.wParam = keycode; > + SET_EXPECT(DocHost_TranslateAccelerator); > + hr = IDocHostUIHandler_TranslateAccelerator(html_dochost,&msg_a,&CGID_MSHTML, 1234); > + ok(hr == 0xdeadbeef, "Got 0x%08x\n", hr); > + CHECK_CALLED(DocHost_TranslateAccelerator); > + } > + hr_dochost_TranslateAccelerator = E_NOTIMPL; > + > + SET_EXPECT(DocHost_TranslateAccelerator); > + hr = IDocHostUIHandler_TranslateAccelerator(html_dochost,&msg_a,&CGID_MSHTML, 1234); > + ok(hr == E_NOTIMPL, "Got 0x%08x\n", hr); > + CHECK_CALLED(DocHost_TranslateAccelerator); > + > + IDocHostUIHandler2_Release(html_dochost); > + } > + IOleClientSite_Release(the_site); > + } > + IOleObject_Release(html_obj); > + } > + IHTMLDocument2_Release(doc_html); > + } > + IDispatch_Release(disp_html); > + } > + > + hr = IUnknown_QueryInterface(unk,&IID_IOleObject, (void**)&pobj); > + ok(hr == S_OK, "Got 0x%08x\n", hr); > + if(SUCCEEDED(hr)) { > + hr = IOleObject_SetClientSite(pobj, NULL); > + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); > + IOleObject_Release(pobj); > + } Use test_ClientSite here. Jacek

1 0

Re: [PATCH 1/2] msvcrt: Added qsort_s implementation. (try 4)
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

"Vincas Miliūnas" <vincas.miliunas(a)gmail.com> writes: > +/********************************************************************* > + * Helper function for MSVCRT_qsort_s. > + * > + * Based on http://github.com/git/git/blob/master/compat/qsort.c > + * > + */ We already have a qsort in ntdll, I'd suggest to copy that (and/or merge possible improvements into it). We don't need two implementations from two different sources. > +/********************************************************************* > + * qsort_s (MSVCRT.@) > + * > + * Based on http://github.com/git/git/blob/master/compat/qsort.c > + * > + */ > +void CDECL MSVCRT_qsort_s(void *b, size_t n, size_t s, > + _QSORT_S_COMPARE_FN cmp, void *context) > +{ > + const size_t size = n * s; You probably want to check for overflow. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/4] shdocvw: Implement InPlaceActiveObject::TranslateAccelerator.
by Marvin Nov. 12, 2010

Nov. 12, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=7011 Your paranoid android. === WVISTAADM (32 bit webbrowser) === webbrowser.c:1308: Test failed: unexpected call UpdateUI webbrowser.c:241: Test failed: unexpected call QueryStatus_STOP === W2K8SE (32 bit webbrowser) === webbrowser.c:1308: Test failed: unexpected call UpdateUI webbrowser.c:241: Test failed: unexpected call QueryStatus_STOP webbrowser.c:1308: Test failed: unexpected call UpdateUI webbrowser.c:241: Test failed: unexpected call QueryStatus_STOP webbrowser.c:301: Test failed: unexpected nsCmdID 28 === W7PRO (32 bit webbrowser) === webbrowser.c:1308: Test failed: unexpected call UpdateUI webbrowser.c:241: Test failed: unexpected call QueryStatus_STOP

1 0

Re: [PATCH] console: fix output for console handles opened with GENERIC_WRITE access
by Eric Pouech Nov. 12, 2010

Nov. 12, 2010

this has already been discussed on wine-devel a couple of days ago the "right" fix is either to fix WriteConsole so that it doesn't require read access (actually FILE_READ_PROPERTIES), or to grant this access user side so the fix in the server will be rejected A+ 2010/11/12 Martin Wilck <Martin.Wilck(a)particle-dynamics.de> > > Writing to a console handle obtained with a requested access mode > GENERIC_WRITE > produces no output. This happens because get_console_mode() requires > FILE_READ_PROPERTIES access on the handle, which a handle created with > GENERIC_WRITE doesn't have. > > This affects many Microsoft console applications, e.g. nmake and cl from > VC++ > express 2005. > > It can be tested with the following minimal test program (compiled with > VC 2005 & run with native mscvr80): > > int main(void) > { > _cprintf("Hi.\n"); > return 0; > } > > This behaves as follows: > > trace:console:OpenConsoleW (L"CONOUT$", 0x40000000, 0, 3) > 0009: open_console( from=0001, access=40000000, attributes=00000000, > share=3 ) > 0009: open_console() = 0 { handle=0028 } > trace:console:WriteConsoleW 0x2b L"H" 1 0x33fb78 (nil) > 0009: get_console_mode( handle=0028 ) > 0009: get_console_mode() = ACCESS_DENIED { mode=0, is_bare=0 } > > Because of the ACCESS_DENIED, this program produces no output on current > wine. > This patch fixies this with a new map_access() function for the console. > > Signed-off-by: Martin Wilck <martin.wilck(a)particle-dynamics.de> > --- > server/console.c | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) > > > -- -- Eric Pouech

1 0

Re: [PATCH 3/4] shdocvw: Implement ControlSite::TranslateAccelerator.
by Marvin Nov. 12, 2010

Nov. 12, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=7010 Your paranoid android. === WVISTAADM (32 bit webbrowser) === webbrowser.c:1301: Test failed: unexpected call UpdateUI webbrowser.c:241: Test failed: unexpected call QueryStatus_STOP === W7PRO (32 bit webbrowser) === webbrowser.c:1301: Test failed: unexpected call UpdateUI webbrowser.c:241: Test failed: unexpected call QueryStatus_STOP

1 0

Re: [PATCH 1/4] shdocvw: Implement DocHostUIHandler::TranslateAccelerator.
by Marvin Nov. 12, 2010

Nov. 12, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=7009 Your paranoid android. === WVISTAADM (32 bit webbrowser) === webbrowser.c:1219: Test failed: unexpected call UpdateUI webbrowser.c:238: Test failed: unexpected call QueryStatus_STOP === W2K8SE (32 bit webbrowser) === webbrowser.c:1219: Test failed: unexpected call UpdateUI webbrowser.c:238: Test failed: unexpected call QueryStatus_STOP webbrowser.c:1219: Test failed: unexpected call UpdateUI webbrowser.c:238: Test failed: unexpected call QueryStatus_STOP webbrowser.c:298: Test failed: unexpected nsCmdID 28 === W7PRO (32 bit webbrowser) === webbrowser.c:1219: Test failed: unexpected call UpdateUI webbrowser.c:238: Test failed: unexpected call QueryStatus_STOP === W7PROX64 (32 bit webbrowser) === webbrowser.c:1219: Test failed: unexpected call UpdateUI webbrowser.c:238: Test failed: unexpected call QueryStatus_STOP

1 0

kernel32: Add a stub for SetProcessDEPPolicy
by Detlef Riekenberg Nov. 11, 2010

Nov. 11, 2010

Any comments available for this Patch? http://source.winehq.org/patches/data/68113 -- By by ... Detlef

1 0

Fwd: Re: d3d9: Improve CheckDeviceState stub to run Firefox 4 Beta 7
by André Hentschel Nov. 11, 2010

Nov. 11, 2010

> From: Lats <lats(a)yless4u.com.au> > Subject: Re: d3d9: Improve CheckDeviceState stub to run Firefox 4 Beta 7 > Message-Id: <4CDC607D.5070507(a)yless4u.com.au> > Date: Fri, 12 Nov 2010 08:30:37 +1100 > > On 11/12/2010 06:35 AM, André Hentschel wrote: >> + static int i; >> >> - return WINED3DERR_INVALIDCALL; >> + TRACE("iface %p, dst_window %p stub!\n", iface, dst_window); >> + >> + if (!i++) >> + FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); >> > Can you tell me what is the purpose of introducing the static int i? It makes the FIXME only display once, so you don't get flooded(just if you want to per trace) -- Best Regards, André Hentschel

1 0

Re: d3d9: Improve CheckDeviceState stub to run Firefox 4 Beta 7
by Austin English Nov. 11, 2010

Nov. 11, 2010

On Thu, Nov 11, 2010 at 9:30 PM, Lats <lats(a)yless4u.com.au> wrote: > On 11/12/2010 06:35 AM, André Hentschel wrote: >> >> + static int i; >> >> - return WINED3DERR_INVALIDCALL; >> + TRACE("iface %p, dst_window %p stub!\n", iface, dst_window); >> + >> + if (!i++) >> + FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); >> > Can you tell me what is the purpose of introducing the static int i? To prevent a flood of FIXME's. The FIXME will only display once, subsequently, there will be a TRACE for each call. -- -Austin

1 0

Re: mshtml/tests: Add some broken 2k8 values
by Jacek Caban Nov. 11, 2010

Nov. 11, 2010

Hi André, On 11/10/10 9:01 PM, André Hentschel wrote: > That really only happens on some 2008: > http://test.winehq.org/data/tests/mshtml:htmldoc.html > --- > dlls/mshtml/tests/htmldoc.c | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) AFAIR these failures are regression after commit 3b20cb11c8c61f141950bc5c71cfae14a35deea0. Looking at the patch it seems that these failures are strange and unexpected. Given that it worked before, we should be able to make it not without using broken() macro. Otherwise we won't be testing refcount leaks on Windows just because exactly one box has strange behavior. Jacek

2 1

Re: AUTHORS list and the C locale on Mac OS X
by James Mckenzie Nov. 11, 2010

Nov. 11, 2010

Charles Davis <cdavis(a)mymail.mines.edu> wrote: > >On 11/9/10 12:13 PM, James Mckenzie wrote: >> No, it is not a bug in GNU sed. The authors.c file needs to have the erroneous characters for the language used by >> MacOSX changed to be acceptable? >That ain't gonna fly. I think we should explicitly use a UTF-8 locale >(like en_US.UTF-8 or some such) instead of the C locale when sed goes >over the AUTHORS file. Don't shoot the messenger. Maybe we can force the use of sed if it exists in the /usr/bin directory then to get around the 'brokenness' of GNU sed on the Mac? If not, it is a real bear to set the language on a Mac per previous discussions on the Users list. James McKenzie

5 12

Re: winmm/tests: Fix test failure in multi-byte locale.
by Marvin Nov. 11, 2010

Nov. 11, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=6989 Your paranoid android. === W98SE (32 bit mci) === mci.c:1007: Test failed: mci status position: 128

1 0

Re: [1/4] msxml3/domdoc: Fix duplicated declarations after document ::get_xml()
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > From 13c41e51047445591cb1b718f835a13bfe28c53d Mon Sep 17 00:00:00 2001 > From: Nikolay Sivov <nsivov(a)codeweavers.com> > Date: Sat, 6 Nov 2010 22:07:11 +0300 > Subject: [PATCH 1/4] Fix duplicated declarations after document ::get_xml() > > --- > dlls/msxml3/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++- > dlls/msxml3/msxml_private.h | 2 + > dlls/msxml3/node.c | 2 +- > dlls/msxml3/tests/domdoc.c | 46 +++++++++++++++++++++++++++++++++++++ > dlls/msxml3/tests/saxreader.c | 1 + > 5 files changed, 99 insertions(+), 2 deletions(-) Sorry for not catching this sooner, this one breaks with libxml 2.6.16: ../../tools/winegcc/winegcc -m32 -B../../tools/winebuild --sysroot=../.. -shared ./msxml3.spec attribute.o bsc.o cdata.o comment.o dispex.o docfrag.o doctype.o domdoc.o domimpl.o element.o entityref.o factory.o httprequest.o main.o node.o nodelist.o nodemap.o parseerror.o pi.o queryresult.o regsvr.o saxreader.o schema.o text.o uuid.o xmldoc.o xmlelem.o xslpattern.tab.o xslpattern.yy.o version.res -o msxml3.dll.so -luuid -lurlmon -lshlwapi -loleaut32 -lole32 -luser32 -ladvapi32 ../../libs/port/libwine_port.a -L/usr/lib -lxml2 -lz -lpthread -licucore -lm Undefined symbols: "_xmlSaveToBuffer", referenced from: _domdoc_get_xml in domdoc.o ld: symbol(s) not found collect2: ld returned 1 exit status winegcc: gcc failed make[1]: *** [msxml3.dll.so] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: inetcpl.cpl: Added Portuguese (Brazilian) translation (try 2)
by Paul Vriens Nov. 11, 2010

Nov. 11, 2010

On 11/11/2010 03:13 PM, Eu wrote: > I had forgotten to configure the author name and e-mail, resending patch. > Hi Gustavo, The header says "English resources for the Internet control panel applet". You also need only one "LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN" at the beginning. There is no need to have this for every resource. -- Cheers, Paul.

1 0

Re: [1/2] version: zero pad section up to virtual size
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Ričardas Barkauskas <miegalius(a)gmail.com> writes: > @@ -282,8 +282,12 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) > } > > /* Read in resource section */ > - resSectionSize = sections[i].SizeOfRawData; > - resSection = HeapAlloc( GetProcessHeap(), 0, resSectionSize ); > + if ( sections[i].SizeOfRawData < sections[i].Misc.VirtualSize ) > + resSectionSize = sections[i].SizeOfRawData; > + else > + resSectionSize = sections[i].Misc.VirtualSize; > + > + resSection = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sections[i].Misc.VirtualSize ); That won't work, the data won't be zero since you'll be reading from the filepast the end of the section. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winspool.drv: skip tests when no printer is installed
by Marvin Nov. 11, 2010

Nov. 11, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=6979 Your paranoid android. === WINEBUILD (build) === Can't determine base name

1 0

Website copyright notice?
by Scott Ritchie Nov. 11, 2010

Nov. 11, 2010

I was looking at the Wine wikipedia article and some jerk is nominating the logo image for deletion for copyright reasons. I wanted to correct the error and point to the license for the file, but couldn't actually find a license to point at. Have we asked this question before? Part of me just assumed the website had the same license as Wine itself (LGPL 2.1 or greater), is that the case? Thanks, Scott Ritchie

2 2

Re: mshtml/tests: Add some broken 2k8 values
by Marvin Nov. 10, 2010

Nov. 10, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=6958 Your paranoid android. === W7PRO (32 bit htmldoc) === htmldoc.c:2241: Test failed: unexpected call UpdateUI htmldoc.c:2466: Test failed: unexpected call Exec_UPDATECOMMANDS

2 1

Re: [PATCH] [Msvcrt]: now using macro for parameters validation itoa_s (and updated the tests as well)
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Eric Pouech <eric.pouech(a)orange.fr> writes: > msvcr90 doesn't set msvcrt's errno in case of error, while msvcrt does > Hence the wrappers inside msvcr90 around _itoa_s and _itow_s calls. Do you have an app that depends on this? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [2/2] oledb32/tests: Add the XP+ behaviour and mark it as todo_wine
by Alex Villacís Lasso Nov. 10, 2010

Nov. 10, 2010

El 10/11/10 15:02, André Hentschel escribió: > That's the behaviour of XP and up: > http://test.winehq.org/data/tests/oledb32:convert.html > > It's tricky to fix in Wine as you really don't know how much space you have in dst and assuming space breaks other tests. > > --- > dlls/oledb32/tests/convert.c | 11 ++++++++--- > 1 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c > index b9ef71f..cdae859 100644 > --- a/dlls/oledb32/tests/convert.c > +++ b/dlls/oledb32/tests/convert.c > @@ -1469,10 +1469,15 @@ static void test_converttostr(void) > memset(dst, 0xcc, sizeof(dst)); > dst_len = 0x1234; > hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_STR, 0,&dst_len, src, dst, 0, 0,&dst_status, 0, 0, 0); > - ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); > - ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); > + todo_wine ok(hr == S_OK || > + broken(hr == DB_E_ERRORSOCCURRED /* Win9x, WinMe, NT4 and 2k */), > + "got %08x\n", hr); > + todo_wine ok(dst_status == DBSTATUS_S_OK || > + broken(dst_status == DBSTATUS_E_DATAOVERFLOW /* Win9x, WinMe, NT4 and 2k */), > + "got %08x\n", dst_status); > ok(dst_len == 4, "got %d\n", dst_len); > - ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); > + todo_wine ok(dst[0] == '4' || > + broken(dst[0] == (char)0xcc /* Win9x, WinMe, NT4 and 2k */), "got %02x\n", dst[0]); > > *(short *)src = 4321; > memset(dst, 0xcc, sizeof(dst)); > Weird. When I wrote that test, the WinXP-SP2 virtual machine did return DB_E_ERRORSOCCURRED/DBSTATUS_E_DATAOVERFLOW on this condition (available space equal to zero), and did not touch the output buffer in the process. In my opinion, Win9x behavior is actually OK, and the behavior you observe is the one that should be flagged as broken. It is hard to imagine the newer behavior (apparently "assume unbounded output buffer if reported space is zero") as more correct than the Win9x behavior. I think this should be treated the same as your 1/2 patch, which flags the behavior as Vista-only brokenness.

2 1

Re: msvcrt: Fixed (_w)fopen_s with test. (try 3)
by Marvin Nov. 10, 2010

Nov. 10, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=6935 Your paranoid android. === W98SE (32 bit file) === file.c:999: Test failed: smaller size block: Wrong error data () file.c:1007: Test failed: smaller size block: Stdout file shouldn't contain data

2 1

Re: msvcrt: Implement strncat_s.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Eryk Wieliczko <ewdevel(a)gmail.com> writes: > +int CDECL MSVCRT_strncat_s( char* dst, MSVCRT_size_t elem, const char* src, MSVCRT_size_t count ) > +{ > + MSVCRT_size_t i, j; > + if(!dst) return MSVCRT_EINVAL; > + if(elem == 0) return MSVCRT_EINVAL; > + if(!src) > + { > + dst[0] = '\0'; > + return MSVCRT_EINVAL; > + } Again, you should be using the parameter checking macros. -- Alexandre Julliard julliard(a)winehq.org

1 0

website: 404 Translated to Hebrew
by Yaron Shahrabani Nov. 10, 2010

Nov. 10, 2010

Kind regards, Yaron Shahrabani <Hebrew translator>

2 1

Re: [PATCH 2/2 resend] urlmon: Added more IInternetProtocolEx tests.
by Marvin Nov. 10, 2010

Nov. 10, 2010

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=6947 Your paranoid android. === W2K3R2SESP2 (32 bit protocol) === protocol.c:978: Test failed: hrResult = 800c0007, expected: 00000000 protocol.c:983: Test failed: dwError == ERROR_SUCCESS protocol.c:2776: Test failed: Read failed: 800c0007 (0 bytes) Timeout

1 0