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