December 2017 - Wine-commits

Jacek Caban : mshtml: Added IDOMEvent::initEvent implementation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 30e2762b823c802f0c2e20fbbd2539b5a96d0c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e2762b823c802f0c2e20fbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:01:23 2017 +0100 mshtml: Added IDOMEvent::initEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 1 - 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c06d062..fba04b5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -218,7 +218,6 @@ static eventid_t str_to_eid(const WCHAR *str) return i; } - ERR("unknown type %s\n", debugstr_w(str)); return EVENTID_LAST; } @@ -1062,11 +1061,39 @@ static HRESULT WINAPI DOMEvent_get_type(IDOMEvent *iface, BSTR *p) return S_OK; } +#ifdef __i386__ +#define nsIDOMEvent_InitEvent(_this,type,bubbles,cancelable) \ + ((void (WINAPI*)(void*,nsIDOMEvent*,const nsAString*,cpp_bool,cpp_bool)) \ + &call_thiscall_func)((_this)->lpVtbl->InitEvent,_this,type,bubbles,cancelable) + +#endif + static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BOOL can_bubble, VARIANT_BOOL cancelable) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString nsstr; + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_w(type), can_bubble, cancelable); + + if(This->target) { + TRACE("called on already dispatched event\n"); + return S_OK; + } + + heap_free(This->type); + This->type = heap_strdupW(type); + if(!This->type) + return E_OUTOFMEMORY; + This->event_id = str_to_eid(type); + + This->bubbles = !!can_bubble; + This->cancelable = !!cancelable; + + nsAString_InitDepend(&nsstr, type); + nsIDOMEvent_InitEvent(This->nsevent, &nsstr, This->bubbles, This->cancelable); + nsAString_Finish(&nsstr); + + return S_OK; } static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f55f064..2387372 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1341,6 +1341,10 @@ static inline VARIANT_BOOL variant_bool(BOOL b) return b ? VARIANT_TRUE : VARIANT_FALSE; } +#ifdef __i386__ +extern void *call_thiscall_func; +#endif + UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4db61dc..8782ece 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2200,7 +2200,6 @@ void NSContainer_Release(NSContainer *This) * This will be removed after the next Gecko update, that will change calling convention on Gecko side. */ #ifdef __i386__ -extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func, "popl %eax\n\t" "popl %edx\n\t"

1 0

Jacek Caban : mshtml: Don't call preventDefault in stopPropagation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: f0b3fe8f836317dd073444570f185b4aedd2739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b3fe8f836317dd073444570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:01:31 2017 +0100 mshtml: Don't call preventDefault in stopPropagation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fba04b5..3d68555 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1117,7 +1117,6 @@ static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) This->stop_propagation = TRUE; nsIDOMEvent_StopPropagation(This->nsevent); - IDOMEvent_preventDefault(&This->IDOMEvent_iface); return S_OK; }

1 0

Jacek Caban : mshtml: Don't store dispatch mode in DOMEvent object.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 986f701cd4c09329786177cd7d493403889f1450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=986f701cd4c09329786177cd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:01:43 2017 +0100 mshtml: Don't store dispatch mode in DOMEvent object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++++++++------------ dlls/mshtml/htmlevent.h | 1 - 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3d68555..aed6111 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -54,6 +54,11 @@ typedef struct { WCHAR type[1]; } listener_container_t; +typedef enum { + DISPATCH_BOTH, + DISPATCH_LEGACY +} dispatch_mode_t; + static const WCHAR abortW[] = {'a','b','o','r','t',0}; static const WCHAR beforeactivateW[] = {'b','e','f','o','r','e','a','c','t','i','v','a','t','e',0}; static const WCHAR beforeunloadW[] = {'b','e','f','o','r','e','u','n','l','o','a','d',0}; @@ -1362,7 +1367,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -static void call_event_handlers(EventTarget *event_target, DOMEvent *event) +static void call_event_handlers(EventTarget *event_target, DOMEvent *event, dispatch_mode_t dispatch_mode) { const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); const BOOL use_quirks = use_event_quirks(event_target); @@ -1421,13 +1426,13 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) continue; break; case LISTENER_TYPE_CAPTURE: - if(event->phase == DEP_BUBBLING_PHASE || event->in_fire_event) + if(event->phase == DEP_BUBBLING_PHASE || dispatch_mode == DISPATCH_LEGACY) continue; break; case LISTENER_TYPE_BUBBLE: - if(event->in_fire_event) + if(event->phase == DEP_CAPTURING_PHASE || dispatch_mode == DISPATCH_LEGACY) continue; - /* fallthrough */ + break; case LISTENER_TYPE_ATTACHED: if(event->phase == DEP_CAPTURING_PHASE) continue; @@ -1463,7 +1468,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(args) = VT_DISPATCH; V_DISPATCH(args) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; V_VT(args+1) = VT_DISPATCH; - V_DISPATCH(args+1) = event->in_fire_event + V_DISPATCH(args+1) = dispatch_mode == DISPATCH_LEGACY ? (IDispatch*)event->event_obj : (IDispatch*)&event->IDOMEvent_iface; V_VT(&v) = VT_EMPTY; @@ -1565,7 +1570,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) event->current_target = NULL; } -void dispatch_event(EventTarget *event_target, DOMEvent *event) +static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, + dispatch_mode_t dispatch_mode) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; @@ -1635,17 +1641,17 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) event->phase = DEP_CAPTURING_PHASE; i = chain_cnt-1; while(!event->stop_propagation && i) - call_event_handlers(target_chain[i--], event); + call_event_handlers(target_chain[i--], event, dispatch_mode); if(!event->stop_propagation) { event->phase = DEP_AT_TARGET; - call_event_handlers(target_chain[0], event); + call_event_handlers(target_chain[0], event, dispatch_mode); } if(event->bubbles) { event->phase = DEP_BUBBLING_PHASE; for(i = 1; !event->stop_propagation && i < chain_cnt; i++) - call_event_handlers(target_chain[i], event); + call_event_handlers(target_chain[i], event, dispatch_mode); } if(target_vtbl && target_vtbl->set_current_event) { @@ -1680,6 +1686,11 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) heap_free(target_chain); } +void dispatch_event(EventTarget *event_target, DOMEvent *event) +{ + dispatch_event_object(event_target, event, DISPATCH_BOTH); +} + HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) { HTMLEventObj *event_obj = NULL; @@ -1727,9 +1738,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va if(SUCCEEDED(hres)) { event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; - event_obj->event->in_fire_event++; - dispatch_event(&node->event_target, event_obj->event); - event_obj->event->in_fire_event--; + dispatch_event_object(&node->event_target, event_obj->event, DISPATCH_LEGACY); event_obj->event->event_obj = NULL; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f99c893..3775e44 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -75,7 +75,6 @@ typedef struct { IHTMLEventObj *event_obj; BOOL no_event_obj; - unsigned in_fire_event; } DOMEvent; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IDOMEvent::dispatchEvent implementation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: d6d23a5339ff5aca147e98e73b46b09fce5b6856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d23a5339ff5aca147e98e73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:02:01 2017 +0100 mshtml: Added IDOMEvent::dispatchEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 46 ++++++++++++++++++++++++++++++++++------------ dlls/mshtml/tests/events.c | 11 +++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index aed6111..7a01ba5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -56,6 +56,7 @@ typedef struct { typedef enum { DISPATCH_BOTH, + DISPATCH_STANDARD, DISPATCH_LEGACY } dispatch_mode_t; @@ -896,6 +897,13 @@ static inline DOMEvent *impl_from_IDOMEvent(IDOMEvent *iface) return CONTAINING_RECORD(iface, DOMEvent, IDOMEvent_iface); } +static const IDOMEventVtbl DOMEventVtbl; + +static inline DOMEvent *unsafe_impl_from_IDOMEvent(IDOMEvent *iface) +{ + return iface && iface->lpVtbl == &DOMEventVtbl ? impl_from_IDOMEvent(iface) : NULL; +} + static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, void **ppv) { DOMEvent *This = impl_from_IDOMEvent(iface); @@ -1434,7 +1442,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp continue; break; case LISTENER_TYPE_ATTACHED: - if(event->phase == DEP_CAPTURING_PHASE) + if(event->phase == DEP_CAPTURING_PHASE || dispatch_mode == DISPATCH_STANDARD) continue; break; } @@ -1570,8 +1578,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp event->current_target = NULL; } -static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, - dispatch_mode_t dispatch_mode) +static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, + dispatch_mode_t dispatch_mode, VARIANT_BOOL *r) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; @@ -1583,14 +1591,14 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); - if(event->event_id == EVENTID_LAST) { - FIXME("Unsupported on unknown events\n"); - return; + if(!event->type) { + FIXME("Uninitialized event.\n"); + return E_FAIL; } if(event->current_target) { FIXME("event is being dispatched.\n"); - return; + return E_FAIL; } iter = event_target; @@ -1654,6 +1662,9 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, call_event_handlers(target_chain[i], event, dispatch_mode); } + if(r) + *r = variant_bool(!event->prevent_default); + if(target_vtbl && target_vtbl->set_current_event) { prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); if(prev_event) @@ -1675,6 +1686,7 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, } } + event->prevent_default = FALSE; if(event_obj_ref) { event->event_obj = NULL; IHTMLEventObj_Release(&event_obj_ref->IHTMLEventObj_iface); @@ -1684,11 +1696,13 @@ static void dispatch_event_object(EventTarget *event_target, DOMEvent *event, IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) heap_free(target_chain); + + return S_OK; } void dispatch_event(EventTarget *event_target, DOMEvent *event) { - dispatch_event_object(event_target, event, DISPATCH_BOTH); + dispatch_event_object(event_target, event, DISPATCH_BOTH, NULL); } HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) @@ -1738,7 +1752,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va if(SUCCEEDED(hres)) { event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; - dispatch_event_object(&node->event_target, event_obj->event, DISPATCH_LEGACY); + dispatch_event_object(&node->event_target, event_obj->event, DISPATCH_LEGACY, NULL); event_obj->event->event_obj = NULL; } @@ -2220,11 +2234,19 @@ static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR return S_OK; } -static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event, VARIANT_BOOL *result) +static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event_iface, VARIANT_BOOL *result) { EventTarget *This = impl_from_IEventTarget(iface); - FIXME("(%p)->(%p %p)\n", This, event, result); - return E_NOTIMPL; + DOMEvent *event = unsafe_impl_from_IDOMEvent(event_iface); + + TRACE("(%p)->(%p %p)\n", This, event, result); + + if(!event) { + WARN("Invalid event\n"); + return E_INVALIDARG; + } + + return dispatch_event_object(This, event, DISPATCH_STANDARD, result); } HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index a943e41..28aa93c 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2667,6 +2667,8 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_create_event(IHTMLDocument2 *doc) { IDocumentEvent *doc_event; + IEventTarget *event_target; + IHTMLElement *elem; IDOMEvent *event; VARIANT_BOOL b; USHORT phase; @@ -2709,6 +2711,15 @@ static void test_create_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_cancelable failed: %08x\n", hres); ok(!b, "cancelable = %x\n", b); + elem = doc_get_body(doc); + hres = IHTMLElement_QueryInterface(elem, &IID_IEventTarget, (void**)&event_target); + IHTMLElement_Release(elem); + + hres = IEventTarget_dispatchEvent(event_target, NULL, &b); + ok(hres == E_INVALIDARG, "dispatchEvent failed: %08x\n", hres); + + IEventTarget_Release(event_target); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Expose IDocumentEvent to scripts.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 49679eb97b7b0233f7d4db65c47520a3a20a5ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49679eb97b7b0233f7d4db65c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:02:11 2017 +0100 mshtml: Expose IDocumentEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c9f21fa..5e3ed75 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5107,8 +5107,10 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t { HTMLDOMNode_init_dispex_info(info, mode); - if(mode >= COMPAT_MODE_IE9) + if(mode >= COMPAT_MODE_IE9) { dispex_info_add_interface(info, IHTMLDocument7_tid, NULL); + dispex_info_add_interface(info, IDocumentEvent_tid, NULL); + } /* Depending on compatibility version, we add interfaces in different order * so that the right getElementById implementation is used. */ diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2387372..aef82cd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -126,6 +126,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ XIID(IDOMEvent) \ + XIID(IDocumentEvent) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index beee493..498dfed 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -62,6 +62,7 @@ function test_doc_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("createEvent", v >= 9); test_exposed("parentWindow", true); if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow");

1 0

Jacek Caban : mshtml/tests: Added more event object tests.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: afb0eeca01c4317f2e5a8e8364cc29f8c68237e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb0eeca01c4317f2e5a8e836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:02:30 2017 +0100 mshtml/tests: Added more event object tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 256 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afb0eeca01c4317f2e5a8…

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 4dad26920a0e50137c80e6157ec9ad5da9c5ab56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dad26920a0e50137c80e6157… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 4 18:37:47 2017 +0200 readme: Update Swedish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.sv | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index eb7260e..b68e699 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -4,7 +4,7 @@ Wine är ett program som gör det möjligt att köra Windows-program (inkluderat DOS, Windows 3.x, Win32 och Win64) i Unix. Det består av en programstartare som startar och kör Windows-programfiler, samt ett bibliotek (kallat Winelib) som implementerar Windows API-anrop med hjälp -av deras Unix- eller X11-motsvarigheter. Biblioteket kan också användas +av motsvarande Unix-, X11- eller Mac-anrop. Biblioteket kan också användas till att porta Windows-kod till vanliga Unix-program. Wine är fri programvara, utgett under villkoren i GNU LGPL; se @@ -18,8 +18,16 @@ Kör följande kommandon i rotkatalogen för Wines källkod: ./configure make +Efteråt antingen installera Wine: + +make install + +Eller kör Wine direkt från dess rotkatalog: + +./wine notepad + Kör program med "wine [val] program". Se resten av denna fil, -Wines man-sidor samt sist men inte minst http://www.winehq.org/ för mer +Wines man-sidor samt sist men inte minst https://www.winehq.org/ för mer information och tips om hur problem kan lösas. @@ -39,7 +47,7 @@ stöder kerneltrådar kommer eventuellt att stödjas i framtiden. Information för FreeBSD: Wine kommer i regel inte att fungera på FreeBSD-versioner äldre än 8.0. - Se http://wiki.freebsd.org/Wine för mer information. + Se https://wiki.freebsd.org/Wine för mer information. Information för Solaris: Wine måste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -71,14 +79,10 @@ Grundläggande krav: Valfria stödbibliotek: configure-skriptet visar varningar när valfria bibliotek inte hittats. - Se http://wiki.winehq.org/Recommended_Packages för information om - vilka paket du bör installera. + Se https://wiki.winehq.org/Recommended_Packages för information om vilka + paket du bör installera. På 64-bitars system måste du säkerställa att du + installerar 32-bitars versionerna av dessa bibliotek. - På 64 bit-system måste du säkerställa att 32 bit-versionerna av - ovannämnda bibliotek installerats; se http://wiki.winehq.org/WineOn64bit - för närmare detaljer. Om du vill ha ett sant 64-bit Wine (eller en mixad - 32- och 64-bit Wine-installation), se http://wiki.winehq.org/Wine64 för - detaljer. 4. KOMPILERING @@ -96,6 +100,7 @@ Kör './configure --help' för att se inställningar och val vid kompilering. För mer information se https://wiki.winehq.org/Building_Wine + 5. INSTALLATION När Wine är byggt kan du köra "make install" för att installera det; @@ -105,7 +110,7 @@ Glöm inte att först avinstallera gamla Wine-versioner. Pröva antingen "dpkg -r wine", "rpm -e wine" eller "make uninstall" före installationen. När Wine är installerat kan du använda inställningsprogrammet "winecfg". -Se hjälpavdelningen på http://www.winehq.org/ för tips om inställningar. +Se hjälpavdelningen på https://www.winehq.org/ för tips om inställningar. 6. KÖRNING AV PROGRAM @@ -132,18 +137,18 @@ rapporterar ett fel. 7. MER INFORMATION Internet: Mycket information om Wine finns samlat på WineHQ på - http://www.winehq.org/ : diverse guider, en programdatabas samt + https://www.winehq.org/ : diverse guider, en programdatabas samt felspårning. Detta är antagligen det bästa stället att börja. -Frågor: Frågor och svar om Wine finns samlade på http://www.winehq.org/FAQ +Frågor: Frågor och svar om Wine finns samlade på https://www.winehq.org/FAQ -Wiki: Wines Wiki finns på http://wiki.winehq.org +Wiki: Wines Wiki finns på https://wiki.winehq.org E-postlistor: Det finns flera e-postlistor för Wine-användare och -utvecklare; se - http://www.winehq.org/forums för mer information. + https://www.winehq.org/forums för mer information. -Fel: Rapportera fel till Wines Bugzilla på http://bugs.winehq.org +Fel: Rapportera fel till Wines Bugzilla på https://bugs.winehq.org Sök i Bugzilla-databasen för att se om problemet redan finns rapporterat innan du sänder en felrapport. @@ -151,7 +156,7 @@ IRC: Hjälp finns tillgänglig online på kanalen #WineHQ på irc.freenode.net. Git: Wines nuvarande utvecklingsversion finns tillgänglig genom Git. - Gå till http://www.winehq.org/git för mer information. + Gå till https://www.winehq.org/git för mer information. Om du lägger till något eller fixar ett fel, är det bra om du sänder en patch (förslagsvis med git-format-patch) till listan wine-devel(a)winehq.org @@ -165,3 +170,6 @@ julliard(a)winehq.org Översatt till svenska av Anders Jonsson anders.jonsson(a)norsjonet.se +och +Lauri Kenttä +lauri.kentta(a)gmail.com

1 0

Hugh McMaster : reg: Print a more informative error message if the system key is invalid.
by Alexandre Julliard 04 Dec '17

04 Dec '17

1 0

Hugh McMaster : reg: Validate the registry key before commencing the export operation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 17494012a0e2aa91e188087fd826e94139e6d430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17494012a0e2aa91e188087fd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:14 2017 +0000 reg: Validate the registry key before commencing the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 720b9ef..9d0d332 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -38,7 +38,7 @@ static BOOL is_overwrite_switch(const WCHAR *s) int reg_export(int argc, WCHAR *argv[]) { - HKEY root; + HKEY root, hkey; WCHAR *path, *long_key; if (argc == 3 || argc > 5) @@ -50,7 +50,16 @@ int reg_export(int argc, WCHAR *argv[]) if (argc == 5 && !is_overwrite_switch(argv[4])) goto error; + if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + { + output_message(STRING_INVALID_KEY); + return 1; + } + FIXME(": operation not yet implemented\n"); + + RegCloseKey(hkey); + return 1; error:

1 0

Hugh McMaster : reg: Prompt the user to overwrite the export file if it already exists.
by Alexandre Julliard 04 Dec '17

04 Dec '17

1 0