wine-commits August 2014

wine-commits@winehq.org

2 participants
304 discussions

Henri Verbeet : wined3d: Replace surface_update_draw_binding() with wined3d_resource_update_draw_binding().
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 1ce3269ac1d6c953258e559b2be8423167c46eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce3269ac1d6c953258e559b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 20 13:19:59 2014 +0200 wined3d: Replace surface_update_draw_binding() with wined3d_resource_update_draw_binding(). --- dlls/wined3d/resource.c | 10 ++++++++++ dlls/wined3d/surface.c | 14 ++------------ dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index dd31cb6..cb7ee9e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -323,3 +323,13 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) * offscreen, otherwise onscreen */ return swapchain->render_to_fbo; } + +void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) +{ + if (!wined3d_resource_is_offscreen(resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + resource->draw_binding = WINED3D_LOCATION_DRAWABLE; + else if (resource->multisample_type) + resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + else + resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; +} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3110e56..6603d46 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -112,16 +112,6 @@ void wined3d_surface_destroy(struct wined3d_surface *surface) HeapFree(GetProcessHeap(), 0, surface); } -void surface_update_draw_binding(struct wined3d_surface *surface) -{ - if (!wined3d_resource_is_offscreen(&surface->resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) - surface->resource.draw_binding = WINED3D_LOCATION_DRAWABLE; - else if (surface->resource.multisample_type) - surface->resource.draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; - else - surface->resource.draw_binding = WINED3D_LOCATION_TEXTURE_RGB; -} - void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) { @@ -157,7 +147,7 @@ void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapc TRACE("surface %p, swapchain %p.\n", surface, swapchain); surface->swapchain = swapchain; - surface_update_draw_binding(surface); + wined3d_resource_update_draw_binding(&surface->resource); } struct blt_info @@ -5974,7 +5964,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text } surface->container = container; - surface_update_draw_binding(surface); + wined3d_resource_update_draw_binding(&surface->resource); surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); list_init(&surface->renderbuffers); list_init(&surface->overlays); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1648a11..1582193 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1144,10 +1144,10 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) { UINT i; - surface_update_draw_binding(swapchain->front_buffer); + wined3d_resource_update_draw_binding(&swapchain->front_buffer->resource); for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { - surface_update_draw_binding(swapchain->back_buffers[i]); + wined3d_resource_update_draw_binding(&swapchain->back_buffers[i]->resource); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 118b5c8..086d13c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2065,6 +2065,7 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 @@ -2305,7 +2306,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Override default onsubmit action with our submit implementation.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 255894c1f1f9f1d5ed1e8f812e5891f3216ce745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=255894c1f1f9f1d5ed1e8f812… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 20 13:04:28 2014 +0200 mshtml: Override default onsubmit action with our submit implementation. --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 484f3f7..33f763e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -218,7 +218,7 @@ static const event_info_t event_info[] = { {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE} + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 10b2df4..df425d1 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -714,12 +714,24 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, return S_OK; } +static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +{ + HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + + if(eid == EVENTID_SUBMIT) { + *prevent_default = TRUE; + return IHTMLFormElement_submit(&This->IHTMLFormElement_iface); + } + + return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); +} + static const NodeImplVtbl HTMLFormElementImplVtbl = { HTMLFormElement_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, - HTMLElement_handle_event, + HTMLFormElement_handle_event, HTMLElement_get_attr_col, NULL, NULL,

1 0

André Hentschel : wpcap: Implement wsockinit.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: b2962fb87ee3faf983537984b3d2ee8988da8f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2962fb87ee3faf983537984b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:02:22 2014 +0200 wpcap: Implement wsockinit. --- dlls/wpcap/Makefile.in | 1 + dlls/wpcap/wpcap.c | 9 +++++++++ dlls/wpcap/wpcap.spec | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 70a0fec..5caffbc 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -1,4 +1,5 @@ MODULE = wpcap.dll +DELAYIMPORTS = ws2_32 EXTRALIBS = @LIBPCAP@ C_SRCS = \ diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 16b92f4..90b0647a 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -19,6 +19,7 @@ */ #include <pcap/pcap.h> +#include "winsock2.h" #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -273,3 +274,11 @@ int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) TRACE("(%p %p)\n", p, ps); return pcap_stats(p, ps); } + +int CDECL wine_wsockinit(void) +{ + WSADATA wsadata; + TRACE("()\n"); + if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; + return 0; +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 33cc9ef..540089d 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -75,4 +75,4 @@ @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex @ stub pcap_strerror -@ stub wsockinit +@ cdecl wsockinit() wine_wsockinit

1 0

André Hentschel : wpcap: Implement pcap_setnonblock.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: f0f57c22bf7c9b25b708b51d423a9a19db2b35c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f57c22bf7c9b25b708b51d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:02:03 2014 +0200 wpcap: Implement pcap_setnonblock. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b1a2149..16b92f4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -256,6 +256,12 @@ int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp) return pcap_setfilter(p, fp); } +int CDECL wine_pcap_setnonblock(pcap_t *p, int nonblock, char *errbuf) +{ + TRACE("(%p %i %p)\n", p, nonblock, errbuf); + return pcap_setnonblock(p, nonblock, errbuf); +} + int CDECL wine_pcap_snapshot(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 13a8f7f..33cc9ef 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -68,7 +68,7 @@ @ cdecl pcap_setfilter(ptr ptr) wine_pcap_setfilter @ stub pcap_setmintocopy @ stub pcap_setmode -@ stub pcap_setnonblock +@ cdecl pcap_setnonblock(ptr long ptr) wine_pcap_setnonblock @ stub pcap_setsampling @ stub pcap_setuserbuffer @ cdecl pcap_snapshot(ptr) wine_pcap_snapshot

1 0

André Hentschel : wpcap: Implement pcap_sendpacket.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 1c460fcd6399ed1c9ad5cdc3c9c6087e4866c474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c460fcd6399ed1c9ad5cdc3c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:01:25 2014 +0200 wpcap: Implement pcap_sendpacket. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index c170413..b1a2149 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -232,6 +232,12 @@ pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); } +int CDECL wine_pcap_sendpacket(pcap_t *p, const unsigned char *buf, int size) +{ + TRACE("(%p %p %i)\n", p, buf, size); + return pcap_sendpacket(p, buf, size); +} + int CDECL wine_pcap_set_datalink(pcap_t *p, int dlt) { TRACE("(%p %i)\n", p, dlt); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 46e1175..13a8f7f 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -58,7 +58,7 @@ @ stub pcap_remoteact_cleanup @ stub pcap_remoteact_close @ stub pcap_remoteact_list -@ stub pcap_sendpacket +@ cdecl pcap_sendpacket(ptr ptr long) wine_pcap_sendpacket @ stub pcap_sendqueue_alloc @ stub pcap_sendqueue_destroy @ stub pcap_sendqueue_queue

1 0

André Hentschel : wpcap: Implement pcap_next_ex.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 1c6902679b50ab46f778b8894a7dcbec99449606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6902679b50ab46f778b8894… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:00:31 2014 +0200 wpcap: Implement pcap_next_ex. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 1509618..c170413 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -208,6 +208,12 @@ const unsigned char* CDECL wine_pcap_next(pcap_t *p, struct pcap_pkthdr *h) return pcap_next(p, h); } +int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const unsigned char **pkt_data) +{ + TRACE("(%p %p %p)\n", p, pkt_header, pkt_data); + return pcap_next_ex(p, pkt_header, pkt_data); +} + #define PCAP_OPENFLAG_PROMISCUOUS 1 pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 193ed52..46e1175 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -44,7 +44,7 @@ @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @ cdecl pcap_next(ptr ptr) wine_pcap_next @ stub pcap_next_etherent -@ stub pcap_next_ex +@ cdecl pcap_next_ex(ptr ptr ptr) wine_pcap_next_ex @ stub pcap_offline_filter @ stub pcap_offline_read @ cdecl pcap_open(str long long long ptr ptr) wine_pcap_open

1 0

André Hentschel : wpcap: Implement pcap_next.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: daae8422a0469639ec8770648e42af50bad365cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=daae8422a0469639ec8770648… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:00:15 2014 +0200 wpcap: Implement pcap_next. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 9335f2d..1509618 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -202,6 +202,12 @@ int CDECL wine_pcap_minor_version(pcap_t *p) return pcap_minor_version(p); } +const unsigned char* CDECL wine_pcap_next(pcap_t *p, struct pcap_pkthdr *h) +{ + TRACE("(%p %p)\n", p, h); + return pcap_next(p, h); +} + #define PCAP_OPENFLAG_PROMISCUOUS 1 pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 34eebbe..193ed52 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -42,7 +42,7 @@ @ cdecl pcap_loop(ptr long ptr ptr) wine_pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version -@ stub pcap_next +@ cdecl pcap_next(ptr ptr) wine_pcap_next @ stub pcap_next_etherent @ stub pcap_next_ex @ stub pcap_offline_filter

1 0

André Hentschel : wpcap: Implement pcap_getnonblock.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 4de7047873c1e78f1aaad349802fcfecb7a89e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de7047873c1e78f1aaad3498… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:00:00 2014 +0200 wpcap: Implement pcap_getnonblock. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index aedfcc6..9335f2d 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -140,6 +140,12 @@ char* CDECL wine_pcap_geterr(pcap_t *p) return pcap_geterr(p); } +int CDECL wine_pcap_getnonblock(pcap_t *p, char *errbuf) +{ + TRACE("(%p %p)\n", p, errbuf); + return pcap_getnonblock(p, errbuf); +} + const char* CDECL wine_pcap_lib_version(void) { const char* ret = pcap_lib_version(); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 8b8a37e..34eebbe 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -31,7 +31,7 @@ @ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent -@ stub pcap_getnonblock +@ cdecl pcap_getnonblock(ptr ptr) wine_pcap_getnonblock @ stub pcap_is_swapped @ cdecl pcap_lib_version() wine_pcap_lib_version @ cdecl pcap_list_datalinks(ptr ptr) wine_pcap_list_datalinks

1 0

André Hentschel : wpcap: Implement pcap_open.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: c070c46ed4ff0d6341972c47a420f5121b72a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c070c46ed4ff0d6341972c47a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:58:06 2014 +0200 wpcap: Implement pcap_open. --- dlls/wpcap/wpcap.c | 11 +++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index fb36326..aedfcc6 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -196,6 +196,17 @@ int CDECL wine_pcap_minor_version(pcap_t *p) return pcap_minor_version(p); } +#define PCAP_OPENFLAG_PROMISCUOUS 1 + +pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, + void *auth, char *errbuf) +{ + int promisc = flags & PCAP_OPENFLAG_PROMISCUOUS; + FIXME("(%s %i %i %i %p %p): partial stub\n", debugstr_a(source), snaplen, flags, read_timeout, + auth, errbuf); + return pcap_open_live(source, snaplen, promisc, read_timeout, errbuf); +} + pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, int to_ms, char *errbuf) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 718d0fe..8b8a37e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -47,7 +47,7 @@ @ stub pcap_next_ex @ stub pcap_offline_filter @ stub pcap_offline_read -@ stub pcap_open +@ cdecl pcap_open(str long long long ptr ptr) wine_pcap_open @ stub pcap_open_dead @ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline

1 0

Shuai Meng : vbscript: Implemented Log.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 5528d728e1b99e7f80a4528980e2369b79237b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5528d728e1b99e7f80a452898… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:13:12 2014 +0800 vbscript: Implemented Log. --- dlls/vbscript/global.c | 13 +++++++++++-- dlls/vbscript/tests/api.vbs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0bb7ccc..6663343 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -723,8 +723,17 @@ static HRESULT Global_Exp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Log(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + if(d <= 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + else + return return_double(res, log(d)); } static HRESULT Global_Sqr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2899b97..44c80de 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1207,4 +1207,34 @@ Call ok(getVT(Exp(True)) = "VT_R8", "getVT(Exp(True)) = " & getVT(Exp(True))) Call ok(Approch(Exp(CByte(2)), 7.389), "Exp(CByte(2)) = " & Exp(CByte(2))) Call ok(getVT(Exp(CByte(2))) = "VT_R8", "getVT(Exp(CByte(2))) = " & getVT(Exp(CByte(2)))) +Sub testLogError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Log(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Log(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testLogError(0, 5, 5) +Call testLogError(-2, 5, 5) +Call testLogError(False, 5, 5) +Call testLogError(True, 5, 5) +Call ok(Approch(Log(1), 0), "Log(1) = " & Log(1)) +Call ok(getVT(Log(1)) = "VT_R8", "getVT(Log(1)) = " & getVT(Log(1))) +Call ok(Approch(Log(CCur(0.5)), -0.6931), "Log(CCur(0.5)) = " & Log(CCur(0.5))) +Call ok(getVT(Log(CCur(0.5))) = "VT_R8", "getVT(Log(CCur(0.5))) = " & getVT(Log(CCur(0.5)))) +Call ok(Approch(Log(CSng(2.7182)), 1), "Log(CSng(2.7182)) = " & Log(CSng(2.7182))) +Call ok(getVT(Log(CSng(2.7182))) = "VT_R8", "getVT(Log(CSng(PI))) = " & getVT(Log(CSng(PI)))) +Call ok(Approch(Log(32768), 10.3972), "Log(32768) = " & Log(32768)) +Call ok(getVT(Log(32768)) = "VT_R8", "getVT(Log(32768)) = " & getVT(Log(32768))) +Call ok(Approch(Log("10"), 2.3025), "Log(""10"") = " & Log("10")) +Call ok(getVT(Log("10")) = "VT_R8", "getVT(Log(""10"")) = " & getVT(Log("10"))) +Call ok(Approch(Log(CByte(2)), 0.6931), "Log(CByte(2)) = " & Log(CByte(2))) +Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CByte(2)))) + Call reportSuccess()

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

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 August 2014