wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Francois Gouget : cmd: Standardize the references to directories in the builtin command usage messages .
by Alexandre Julliard 01 Oct '13

01 Oct '13

1 0

Francois Gouget : cmd: Mention that the % must be doubled for FOR variables in batch files.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b151052be4f783b1475face85a42ff96fe3f1816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b151052be4f783b1475face85… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 17:14:39 2013 +0200 cmd: Mention that the % must be doubled for FOR variables in batch files. Also standardize on the 'Usage:' prefix for usage messages. --- po/ar.po | 169 ++++++++++++++++++++++++++------------------------ po/bg.po | 164 ++++++++++++++++++++++++------------------------ po/ca.po | 169 ++++++++++++++++++++++++++------------------------ po/cs.po | 169 ++++++++++++++++++++++++++------------------------ po/da.po | 169 ++++++++++++++++++++++++++------------------------ po/de.po | 169 ++++++++++++++++++++++++++------------------------ po/el.po | 164 ++++++++++++++++++++++++------------------------ po/en.po | 168 +++++++++++++++++++++++++------------------------ po/en_US.po | 168 +++++++++++++++++++++++++------------------------ po/eo.po | 164 ++++++++++++++++++++++++------------------------ po/es.po | 169 ++++++++++++++++++++++++++------------------------ po/fa.po | 164 ++++++++++++++++++++++++------------------------ po/fi.po | 169 ++++++++++++++++++++++++++------------------------ po/fr.po | 169 ++++++++++++++++++++++++++------------------------ po/he.po | 169 ++++++++++++++++++++++++++------------------------ po/hi.po | 164 ++++++++++++++++++++++++------------------------ po/hr.po | 164 ++++++++++++++++++++++++------------------------ po/hu.po | 169 ++++++++++++++++++++++++++------------------------ po/it.po | 169 ++++++++++++++++++++++++++------------------------ po/ja.po | 169 ++++++++++++++++++++++++++------------------------ po/ko.po | 169 ++++++++++++++++++++++++++------------------------ po/lt.po | 169 ++++++++++++++++++++++++++------------------------ po/ml.po | 164 ++++++++++++++++++++++++------------------------ po/nb_NO.po | 169 ++++++++++++++++++++++++++------------------------ po/nl.po | 169 ++++++++++++++++++++++++++------------------------ po/or.po | 164 ++++++++++++++++++++++++------------------------ po/pa.po | 164 ++++++++++++++++++++++++------------------------ po/pl.po | 169 ++++++++++++++++++++++++++------------------------ po/pt_BR.po | 169 ++++++++++++++++++++++++++------------------------ po/pt_PT.po | 169 ++++++++++++++++++++++++++------------------------ po/rm.po | 164 ++++++++++++++++++++++++------------------------ po/ro.po | 169 ++++++++++++++++++++++++++------------------------ po/ru.po | 169 ++++++++++++++++++++++++++------------------------ po/sk.po | 164 ++++++++++++++++++++++++------------------------ po/sl.po | 169 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 164 ++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 164 ++++++++++++++++++++++++------------------------ po/sv.po | 169 ++++++++++++++++++++++++++------------------------ po/te.po | 164 ++++++++++++++++++++++++------------------------ po/th.po | 164 ++++++++++++++++++++++++------------------------ po/tr.po | 169 ++++++++++++++++++++++++++------------------------ po/uk.po | 169 ++++++++++++++++++++++++++------------------------ po/wa.po | 164 ++++++++++++++++++++++++------------------------ po/wine.pot | 164 ++++++++++++++++++++++++------------------------ po/zh_CN.po | 164 ++++++++++++++++++++++++------------------------ po/zh_TW.po | 169 ++++++++++++++++++++++++++------------------------ programs/cmd/cmd.rc | 4 +- 47 files changed, 3957 insertions(+), 3729 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b151052be4f783b1475fa…

1 0

Francois Gouget : winmm: Fix two error messages to not point users to a MIDI Mapper configuration applet we don 't have.
by Alexandre Julliard 01 Oct '13

01 Oct '13

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: d3672524ed2fe8835479322b27f148c3e99e2843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3672524ed2fe8835479322b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 17:02:00 2013 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/trackbar.c | 2 +- dlls/gdi32/tests/font.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/kernel32/tests/console.c | 6 +++--- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/tests/htmldoc.c | 22 +++++++++++----------- tools/winebuild/utils.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 2e76000..3f57b1c 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -731,7 +731,7 @@ static void test_selection(HWND hWndTrackbar){ expect(8, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, selection_test_seq, "selection test sequence", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test seqence", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test sequence", TRUE); } static void test_thumb_length(HWND hWndTrackbar){ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eed9cec..9f8d970 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1304,7 +1304,7 @@ static void test_GetCharABCWidths(void) strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; - trace("ABC sign test for a varity of transforms:\n"); + trace("ABC sign test for a variety of transforms:\n"); hfont = CreateFontIndirectA(&lf); hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index f92b2c1..0324304 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1056,7 +1056,7 @@ static void test_InvalidIMC(void) imc2 = ImmGetContext(hwnd); ok(imc1 == imc2, "imc should not changed! imc1 %p, imc2 %p\n", imc1, imc2); - /* Test associating NULL imc, which is different to invalid imc */ + /* Test associating NULL imc, which is different from an invalid imc */ oldimc = ImmAssociateContext(hwnd, imc_null); ok(oldimc != NULL, "Associating to NULL imc should success!\n"); imc2 = ImmGetContext(hwnd); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b02e723..d2ce294 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -458,7 +458,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) static void testWrite(HANDLE hCon, COORD sbSize) { - /* FIXME: should in fact insure that the sb is at least 10 character wide */ + /* FIXME: should in fact ensure that the sb is at least 10 characters wide */ ok(SetConsoleTextAttribute(hCon, TEST_ATTRIB), "Setting default text color\n"); resetContent(hCon, sbSize, FALSE); testEmptyWrite(hCon); @@ -654,8 +654,8 @@ static void testCtrlHandler(void) ok(!SetConsoleCtrlHandler(mch, FALSE), "Shouldn't succeed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError()); ok(SetConsoleCtrlHandler(mch, TRUE), "Couldn't set handler\n"); - /* wine requires the event for the test, as we cannot insure, so far, that event - * are processed synchronously in GenerateConsoleCtrlEvent() + /* wine requires the event for the test, as we cannot ensure, so far, that + * events are processed synchronously in GenerateConsoleCtrlEvent() */ mch_event = CreateEventA(NULL, TRUE, FALSE, NULL); mch_count = 0; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b4a7d82..ddb6d85 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3692,7 +3692,7 @@ interface nsIDocShell : nsIDocShellTreeItem nsresult GetHasEditingSession(bool *aHasEditingSession); nsresult MakeEditable(bool inWaitForUriLoad); nsresult GetChildSHEntry(int32_t aChildOffset, nsISHEntry **_retval); - nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChilden); + nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChildren); nsresult GetUseGlobalHistory(bool *aUseGlobalHistory); nsresult SetUseGlobalHistory(bool aUseGlobalHistory); nsresult RemoveFromSessionHistory(); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 02da764..f19f04d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -219,7 +219,7 @@ static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window, no_travellog; static BOOL report_mime; static BOOL testing_submit; -static BOOL reseting_document; +static BOOL resetting_document; static int stream_read, protocol_read; static IStream *history_stream; static enum load_state_t { @@ -950,7 +950,7 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) { - if(reseting_document) + if(resetting_document) return S_OK; switch(dispID) { @@ -1853,7 +1853,7 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT2(SetStatusText); if(!expect_status_text) ok(pszStatusText == NULL, "pszStatusText=%p, expected NULL\n", pszStatusText); @@ -2490,7 +2490,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT(GetHostInfo); ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(pInfo != NULL, "pInfo=NULL\n"); @@ -2783,7 +2783,7 @@ static void test_save_history(IUnknown *unk) static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if(reseting_document) + if(resetting_document) return E_FAIL; if(!pguidCmdGroup) { @@ -3160,7 +3160,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - if(reseting_document) + if(resetting_document) return E_FAIL; ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); @@ -3231,7 +3231,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember IHTMLDocument2 *doc; BSTR state; - if(reseting_document) + if(resetting_document) return E_FAIL; ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); @@ -3514,7 +3514,7 @@ static HRESULT WINAPI DocObjectService_GetPendingUrl( IDocObjectService* This, BSTR *pbstrPendingUrl) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT(GetPendingUrl); return E_NOTIMPL; } @@ -5294,7 +5294,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) "uninitialized" }; - if(open_call || reseting_document) + if(open_call || resetting_document) return; /* FIXME */ if(!unk) @@ -7679,12 +7679,12 @@ static void reset_document(IHTMLDocument2 *doc) if(FAILED(hres)) return; - reseting_document = TRUE; + resetting_document = TRUE; hres = IPersistStreamInit_InitNew(init); ok(hres == S_OK, "Load failed: %08x\n", hres); - reseting_document = FALSE; + resetting_document = FALSE; test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9c497ed..d92a731 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -473,7 +473,7 @@ const char *get_nm_command(void) if (!nm_command) fatal_error( "cannot find suitable name lister\n" ); if (nm_command->count > 1) - fatal_error( "multiple arguemnts in nm command not supported yet\n" ); + fatal_error( "multiple arguments in nm command not supported yet\n" ); return nm_command->str[0]; }

1 0

Hans Leidekker : ntdll: Fix the version reported for 64-bit Windows XP.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b0755344c46886f8ae1f294fdc207166dc6783fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0755344c46886f8ae1f294fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 16:34:20 2013 +0200 ntdll: Fix the version reported for 64-bit Windows XP. --- dlls/ntdll/version.c | 15 +++++++++++++-- programs/winecfg/appdefaults.c | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 86637fc..1939c76 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -50,6 +50,7 @@ typedef enum NT40, /* Windows NT 4.0 */ NT2K, /* Windows 2000 */ WINXP, /* Windows XP */ + WINXP64, /* Windows XP 64-bit */ WIN2K3, /* Windows 2003 */ WINVISTA,/* Windows Vista */ WIN2K8, /* Windows 2008 */ @@ -134,6 +135,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}, 3, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, + /* WINXP64 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, /* WIN2K3 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, @@ -185,6 +192,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "nt40", /* NT40 */ "win2000,win2k,nt2k,nt2000", /* NT2K */ "winxp", /* WINXP */ + "winxp64", /* WINXP64 */ "win2003,win2k3", /* WIN2K3 */ "vista,winvista", /* WINVISTA*/ "win2008,win2k8", /* WIN2K8 */ @@ -468,13 +476,16 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - + static const int is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - current_version = &VersionData[WINXP]; /* default if nothing else is specified */ + if (is_win64 || is_wow64) + current_version = &VersionData[WINXP64]; /* default if nothing else is specified */ + else + current_version = &VersionData[WINXP]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index c8940a6..fdb0a71 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -55,6 +55,9 @@ static const struct { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, +#ifdef _WIN64 + { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, +#else { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, @@ -65,6 +68,7 @@ static const struct { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} +#endif }; #define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0]))

1 0

Jacek Caban : mshtml: Added support for 'document' and 'window' script for attribute values.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 5cdb4a273eefaa3c77e41e2875d7a759e8892d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdb4a273eefaa3c77e41e287… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 1 15:43:52 2013 +0200 mshtml: Added support for 'document' and 'window' script for attribute values. --- dlls/mshtml/htmlevent.c | 6 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 46 +++++++++++++++++++++++++++------------- dlls/mshtml/tests/events.html | 8 ++++++- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a7b2969..a564907 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1510,11 +1510,11 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_elem_event(HTMLDocumentNode *doc, HTMLElement *elem, const WCHAR *event, IDispatch *disp) +void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %s %p)\n", doc, elem, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1522,7 +1522,7 @@ void bind_elem_event(HTMLDocumentNode *doc, HTMLElement *elem, const WCHAR *even return; } - set_event_handler_disp(&elem->node.event_target, elem->node.nsnode, doc, eid, disp); + set_event_handler_disp(event_target, node ? node->nsnode : NULL, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp, nsIDOMNode *nsnode) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ca39038..abd19c2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -62,7 +62,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*,nsIDOM HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_elem_event(HTMLDocumentNode*,HTMLElement*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3174bd2..8a74554 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1046,11 +1046,12 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static HTMLElement *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) { + HTMLDOMNode *target_node = NULL; + event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; - HTMLElement *elem; nsresult nsres; HRESULT hres; @@ -1063,17 +1064,27 @@ static HTMLElement *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement * } nsAString_GetData(&target_id_str, &target_id); - if(!*target_id || !strcmpW(target_id, documentW) || !strcmpW(target_id, windowW)) { - FIXME("for %s not supported\n", debugstr_w(target_id)); - elem = NULL; + if(!*target_id) { + FIXME("Empty for attribute\n"); + }else if(!strcmpW(target_id, documentW)) { + target = &doc->node.event_target; + target_node = &doc->node; + IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + }else if(!strcmpW(target_id, windowW)) { + target = &doc->body_event_target; }else { - hres = get_doc_elem_by_id(doc, target_id, &elem); - if(FAILED(hres)) - elem = NULL; + HTMLElement *target_elem; + + hres = get_doc_elem_by_id(doc, target_id, &target_elem); + if(SUCCEEDED(hres) && target_elem) { + target_node = &target_elem->node; + target = &target_elem->node.event_target; + } } nsAString_Finish(&target_id_str); - return elem; + *ret_target_node = target_node; + return target; } static BOOL parse_event_str(WCHAR *event, const WCHAR **args) @@ -1168,8 +1179,9 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLPluginContainer *plugin_container; nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; - HTMLElement *event_target; + event_target_t **event_target; nsIDOMNodeList *node_list; + HTMLDOMNode *target_node; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1216,17 +1228,21 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem); + event_target = find_event_target(doc, script_elem, &target_node); if(event_target) { - hres = IHTMLElement_QueryInterface(&event_target->IHTMLElement_iface, &IID_HTMLPluginContainer, - (void**)&plugin_container); + if(target_node) + hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + (void**)&plugin_container); + else + hres = E_NOINTERFACE; if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_elem_event(doc, event_target, event, event_disp); + bind_node_event(doc, event_target, target_node, event, event_disp); - IHTMLElement_Release(&event_target->IHTMLElement_iface); + if(target_node) + IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); } heap_free(event); diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 131ba19..bf8a21f 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,7 +1,7 @@ <html> <head> <script> -var testevent_divid2_called = false, cnt=0; +var testevent_divid2_called = false, testevent_document_called = false, cnt=0; function ok(b,m) { return external.ok(b, m); @@ -71,8 +71,11 @@ function test_scriptfor() { ok("onclick" in div, "testevent not in div"); ok(typeof(div.onclick) === "function", "typeof(div.onclick) = " + typeof(div.onclick)); ok(testevent_divid2_called === false, "testevent_divid2_called = " + testevent_divid2_called); + ok(typeof(document.onclick) === "function", "typeof(document.onclick) = " + typeof(document.onclick)); + ok(testevent_document_called === false, "testevent_document_called = " + testevent_document_called); div.click(); ok(testevent_divid2_called === true, "testevent_divid2_called = " + testevent_divid2_called); + ok(testevent_document_called === true, "testevent_document_called = " + testevent_document_called); ok(!("ontest" in div), "testevent in div"); ok(typeof(div.ontest) === "undefined", "typeof(div.ontest) = " + typeof(div.ontest)); @@ -136,6 +139,9 @@ function runTests(t) { <script event="onclick" for="divid2"> testevent_divid2_called = true; </script> +<script event="onclick" for="document"> + testevent_document_called = true; +</script> <script event="ontest" for="divid2"> ok(false, "unexpected ontest"); </script>

1 0

Alexandre Julliard : libwine: Add JNI initialisation support to start Wine from an Android activity.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: c30923f25b8db32c25ffaf8279c9d61b70887d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30923f25b8db32c25ffaf827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 13:47:40 2013 +0200 libwine: Add JNI initialisation support to start Wine from an Android activity. --- libs/wine/loader.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5891a20..f59942d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -53,6 +53,10 @@ extern char **environ; #endif +#ifdef __ANDROID__ +#include <jni.h> +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -803,6 +807,105 @@ static void apple_main_thread( void (*init_func)(void) ) #endif +#ifdef __ANDROID__ + +#ifndef WINE_JAVA_CLASS +#define WINE_JAVA_CLASS "org/winehq/wine/WineActivity" +#endif + +static JavaVM *java_vm; +static jobject java_object; + +/* return the Java VM that was used for JNI initialisation */ +JavaVM *wine_get_java_vm(void) +{ + return java_vm; +} + +/* return the Java object that called the wine_init method */ +jobject wine_get_java_object(void) +{ + return java_object; +} + +/* main Wine initialisation */ +static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jobjectArray environment ) +{ + char **argv; + char *str; + char error[1024]; + int i, argc, length; + + /* get the command line array */ + + argc = (*env)->GetArrayLength( env, cmdline ); + for (i = length = 0; i < argc; i++) + { + jobject str_obj = (*env)->GetObjectArrayElement( env, cmdline, i ); + length += (*env)->GetStringUTFLength( env, str_obj ) + 1; + } + + argv = malloc( (argc + 1) * sizeof(*argv) + length ); + str = (char *)(argv + argc + 1); + for (i = 0; i < argc; i++) + { + jobject str_obj = (*env)->GetObjectArrayElement( env, cmdline, i ); + length = (*env)->GetStringUTFLength( env, str_obj ); + (*env)->GetStringUTFRegion( env, str_obj, 0, length, str ); + argv[i] = str; + str[length] = 0; + str += length + 1; + } + argv[argc] = NULL; + + /* set the environment variables */ + + if (environment) + { + int count = (*env)->GetArrayLength( env, environment ); + for (i = 0; i < count - 1; i += 2) + { + jobject var_obj = (*env)->GetObjectArrayElement( env, environment, i ); + jobject val_obj = (*env)->GetObjectArrayElement( env, environment, i + 1 ); + const char *var = (*env)->GetStringUTFChars( env, var_obj, NULL ); + + if (val_obj) + { + const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); + setenv( var, val, 1 ); + (*env)->ReleaseStringUTFChars( env, val_obj, val ); + } + else unsetenv( var ); + + (*env)->ReleaseStringUTFChars( env, var_obj, var ); + } + } + + java_object = (*env)->NewGlobalRef( env, obj ); + + wine_init( argc, argv, error, sizeof(error) ); + return (*env)->NewStringUTF( env, error ); +} + +jint JNI_OnLoad( JavaVM *vm, void *reserved ) +{ + static const JNINativeMethod method = + { + "wine_init", "([Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;", wine_init_jni + }; + + JNIEnv *env; + jclass class; + + java_vm = vm; + if ((*vm)->AttachCurrentThread( vm, &env, NULL ) != JNI_OK) return JNI_ERR; + if (!(class = (*env)->FindClass( env, WINE_JAVA_CLASS ))) return JNI_ERR; + (*env)->RegisterNatives( env, class, &method, 1 ); + return JNI_VERSION_1_6; +} + +#endif /* __ANDROID__ */ + /*********************************************************************** * wine_init *

1 0

Jacek Caban : urlmon: Include values from 'Post Platform' registry key in user agent string.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 7226c490980803fd98224c531e5f30dfd7fa2119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7226c490980803fd98224c531… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 1 13:21:00 2013 +0200 urlmon: Include values from 'Post Platform' registry key in user agent string. --- dlls/urlmon/session.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index ce6ab4e..bb41c31 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -534,15 +534,26 @@ static void ensure_useragent(void) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - WCHAR buf[512]; + WCHAR buf[512], *ret, *tmp; + DWORD res, idx=0; + size_t len, size; BOOL is_wow; + HKEY key; static const WCHAR formatW[] = {'M','o','z','i','l','l','a','/','4','.','0', ' ','(','c','o','m','p','a','t','i','b','l','e',';', ' ','M','S','I','E',' ','8','.','0',';', ' ','W','i','n','d','o','w','s',' ','%','s','%','d','.','%','d',';', - ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',')',0}; + ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',0}; + static const WCHAR post_platform_keyW[] = + {'S','O','F','T','W','A','R','E', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s', + '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', + '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; static const WCHAR win32W[] = {'W','i','n','3','2',0}; static const WCHAR win64W[] = {'W','i','n','6','4',0}; @@ -563,7 +574,48 @@ static void ensure_useragent(void) os_type = win32W; sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); - user_agent = heap_strdupW(buf); + len = strlenW(buf); + + size = len+40; + ret = heap_alloc(size * sizeof(WCHAR)); + if(!ret) + return; + + memcpy(ret, buf, len*sizeof(WCHAR)); + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, post_platform_keyW, &key); + if(res == ERROR_SUCCESS) { + DWORD value_len; + + while(1) { + value_len = sizeof(buf)/sizeof(WCHAR); + res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); + if(res != ERROR_SUCCESS) + break; + idx++; + + if(len + value_len + 2 /* strlen("; ") */ + 1 /* trailing ')' */ >= size) { + tmp = heap_realloc(ret, (size*2+value_len)*sizeof(WCHAR)); + if(!tmp) + break; + ret = tmp; + size = size*2+value_len; + } + + ret[len++] = ';'; + ret[len++] = ' '; + memcpy(ret+len, buf, value_len*sizeof(WCHAR)); + len += value_len; + } + + RegCloseKey(key); + } + + ret[len++] = ')'; + ret[len++] = 0; + + user_agent = ret; + TRACE("Using user agent %s\n", debugstr_w(user_agent)); } LPWSTR get_useragent(void)

1 0

Stefan Dösinger : wined3d: Don' t invert blits from offscreen surfaces.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 723e518312fa7a030b444e714c118c335ad57699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723e518312fa7a030b444e714… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 1 13:05:39 2013 +0200 wined3d: Don't invert blits from offscreen surfaces. --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 282c2d0..e1d2faa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7460,7 +7460,8 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE + && !surface_is_offscreen(src_surface)) { /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can

1 0

Hans Leidekker : wmic: Convert integer property values to BSTR.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 471bcd7e134db2d7edc115859b794e285f829485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=471bcd7e134db2d7edc115859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 11:35:46 2013 +0200 wmic: Convert integer property values to BSTR. --- programs/wmic/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 8d89bf4..5aee4c1 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -229,6 +229,7 @@ static int query_prop( const WCHAR *alias, const WCHAR *propname ) } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { + VariantChangeType( &v, &v, 0, VT_BSTR ); output_string( fmtW, V_BSTR( &v ) ); VariantClear( &v ); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013