wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Jacek Caban : winemac: Implement DesktopWindowProc driver entry point.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: b34018db20bcd55cb1266d4aa3c7e5257ca96a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34018db20bcd55cb1266d4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:09:13 2022 +0200 winemac: Implement DesktopWindowProc driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 9 ++------- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 673dca40270..151bb144da1 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -268,6 +268,7 @@ static const struct user_driver_funcs macdrv_funcs = .pClipCursor = macdrv_ClipCursor, .pCreateDesktopWindow = macdrv_CreateDesktopWindow, .pCreateWindow = macdrv_CreateWindow, + .pDesktopWindowProc = macdrv_DesktopWindowProc, .pDestroyCursorIcon = macdrv_DestroyCursorIcon, .pDestroyWindow = macdrv_DestroyWindow, .pEnumDisplaySettingsEx = macdrv_EnumDisplaySettingsEx, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 71a8d9f5bd2..79ae074dac6 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -137,6 +137,7 @@ extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateDesktopWindow(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateWindow(HWND hwnd) DECLSPEC_HIDDEN; +extern LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; extern void macdrv_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_SetFocus(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 147c979ebde..d5bcce654e8 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1557,11 +1557,9 @@ BOOL macdrv_CreateDesktopWindow(HWND hwnd) } -static WNDPROC desktop_orig_wndproc; - #define WM_WINE_NOTIFY_ACTIVITY WM_USER -static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) { @@ -1580,7 +1578,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, break; } } - return desktop_orig_wndproc( hwnd, msg, wp, lp ); + return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); } /********************************************************************** @@ -1590,9 +1588,6 @@ BOOL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) { - desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), - GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); - macdrv_init_clipboard(); } return TRUE;

1 0

Brendan Shanks : ntdll: Avoid truncating pointer to 32-bits in get_cpu_area().
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: fe52b067bf9a9733e4c6929f63ab13363b87d39e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe52b067bf9a9733e4c6929f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 17 13:32:29 2022 -0700 ntdll: Avoid truncating pointer to 32-bits in get_cpu_area(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 2 +- dlls/ntdll/unix/thread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 7b36c988e81..0b4245fdd42 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -161,7 +161,7 @@ NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, for (i = 0; i < ARRAY_SIZE(data); i++) { -#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((align) - 1))) +#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((ULONG_PTR)(align) - 1))) if (data[i].machine != cpu->Machine) continue; info->Context = ALIGN( cpu + 1, data[i].align ); info->ContextEx = ALIGN( (char *)info->Context + data[i].size, sizeof(void *) ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 503230e4634..6d937675bcb 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1111,7 +1111,7 @@ void *get_cpu_area( USHORT machine ) case IMAGE_FILE_MACHINE_ARM64: align = TYPE_ALIGNMENT(ARM64_NT_CONTEXT); break; default: return NULL; } - return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~(align - 1)); + return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~((ULONG_PTR)align - 1)); }

1 0

Brendan Shanks : ntdll: Use 32-bit stack in alloc_fs_sel().
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 57c04fd07c5653ac0606587ea2b233b46fe40eb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c04fd07c5653ac0606587e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 17 13:50:24 2022 -0700 ntdll: Use 32-bit stack in alloc_fs_sel(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 34334f72ff0..cd50df0c805 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -94,7 +94,7 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "pushq %rbx\n\t" "pushq %rdi\n\t" "movq %rsp,%rdi\n\t" - "movq %gs:0x8,%rsp\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ "subl $0x10,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ "movl %ecx,(%rsp)\n\t" /* entry_number */

1 0

Matteo Bruni : d3dx9: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 24a4b8caf1bb486c2f66389c4b312eb754ae160f URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a4b8caf1bb486c2f66389c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 26 10:59:38 2022 +0200 d3dx9: Build without -DWINE_NO_LONG_TYPES. Based on a patch by Eric Pouech. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/animation.c | 22 ++--- dlls/d3dx9_36/core.c | 8 +- dlls/d3dx9_36/effect.c | 179 ++++++++++++++++++++------------------- dlls/d3dx9_36/font.c | 8 +- dlls/d3dx9_36/line.c | 10 +-- dlls/d3dx9_36/math.c | 30 +++---- dlls/d3dx9_36/mesh.c | 143 ++++++++++++++++---------------- dlls/d3dx9_36/preshader.c | 8 +- dlls/d3dx9_36/render.c | 50 +++++------ dlls/d3dx9_36/shader.c | 65 ++++++++------- dlls/d3dx9_36/skin.c | 112 +++++++++++++------------ dlls/d3dx9_36/sprite.c | 12 +-- dlls/d3dx9_36/surface.c | 61 +++++++------- dlls/d3dx9_36/texture.c | 207 ++++++++++++++++++++-------------------------- dlls/d3dx9_36/volume.c | 87 +++++++------------ dlls/d3dx9_36/xfile.c | 28 +++---- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- 36 files changed, 514 insertions(+), 556 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24a4b8caf1bb486c2f66…

1 0

Matteo Bruni : d3dx9/xfile: Don't unnecessarily use long integer type.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 29a84c9c337673256c4e4484118992e17c359327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a84c9c337673256c4e4484… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 26 11:16:00 2022 +0200 d3dx9/xfile: Don't unnecessarily use long integer type. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/xfile.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 4f7d3eefd60..c845ac289c5 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -56,7 +56,7 @@ struct d3dx9_file_enum_object { ID3DXFileEnumObject ID3DXFileEnumObject_iface; LONG ref; - ULONG nb_children; + unsigned int child_count; ID3DXFileData **children; }; @@ -66,7 +66,7 @@ struct d3dx9_file_data LONG ref; BOOL reference; IDirectXFileData *dxfile_data; - ULONG nb_children; + unsigned int child_count; ID3DXFileData **children; }; @@ -124,7 +124,7 @@ static ULONG WINAPI d3dx9_file_data_Release(ID3DXFileData *iface) { ULONG i; - for (i = 0; i < file_data->nb_children; ++i) + for (i = 0; i < file_data->child_count; ++i) { ID3DXFileData *child = file_data->children[i]; child->lpVtbl->Release(child); @@ -256,7 +256,7 @@ static HRESULT WINAPI d3dx9_file_data_GetChildren(ID3DXFileData *iface, SIZE_T * if (!children) return E_POINTER; - *children = file_data->nb_children; + *children = file_data->child_count; return S_OK; } @@ -337,7 +337,7 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi while (SUCCEEDED(ret = IDirectXFileData_GetNextObject(object->dxfile_data, &data_object))) { - if (object->nb_children >= children_array_size) + if (object->child_count >= children_array_size) { ID3DXFileData **new_children; @@ -359,11 +359,11 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi } object->children = new_children; } - ret = d3dx9_file_data_create(data_object, &object->children[object->nb_children]); + ret = d3dx9_file_data_create(data_object, &object->children[object->child_count]); IUnknown_Release(data_object); if (FAILED(ret)) break; - object->nb_children++; + ++object->child_count; } if (ret != DXFILEERR_NOMOREOBJECTS) { @@ -375,12 +375,12 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi ID3DXFileData **new_children; new_children = HeapReAlloc(GetProcessHeap(), 0, object->children, - sizeof(*object->children) * object->nb_children); + sizeof(*object->children) * object->child_count); if (new_children) object->children = new_children; } - TRACE("Found %u children\n", object->nb_children); + TRACE("Found %u children.\n", object->child_count); *ret_iface = &object->ID3DXFileData_iface; @@ -426,7 +426,7 @@ static ULONG WINAPI d3dx9_file_enum_object_Release(ID3DXFileEnumObject *iface) { ULONG i; - for (i = 0; i < file_enum->nb_children; ++i) + for (i = 0; i < file_enum->child_count; ++i) { ID3DXFileData *child = file_enum->children[i]; child->lpVtbl->Release(child); @@ -454,7 +454,7 @@ static HRESULT WINAPI d3dx9_file_enum_object_GetChildren(ID3DXFileEnumObject *if if (!children) return E_POINTER; - *children = file_enum->nb_children; + *children = file_enum->child_count; return S_OK; } @@ -615,7 +615,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * /* Fill enum object with top level data objects */ while (SUCCEEDED(ret = IDirectXFileEnumObject_GetNextDataObject(dxfile_enum_object, &data_object))) { - if (object->nb_children >= children_array_size) + if (object->child_count >= children_array_size) { ID3DXFileData **new_children; @@ -638,18 +638,18 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * object->children = new_children; } ret = d3dx9_file_data_create((IDirectXFileObject*)data_object, - &object->children[object->nb_children]); + &object->children[object->child_count]); IUnknown_Release(data_object); if (FAILED(ret)) break; - object->nb_children++; + ++object->child_count; } if (object->children) { ID3DXFileData **new_children; new_children = HeapReAlloc(GetProcessHeap(), 0, object->children, - sizeof(*object->children) * object->nb_children); + sizeof(*object->children) * object->child_count); if (new_children) object->children = new_children; } @@ -659,7 +659,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * if (ret != DXFILEERR_NOMOREOBJECTS) WARN("Cannot get all top level data objects\n"); - TRACE("Found %u children\n", object->nb_children); + TRACE("Found %u children.\n", object->child_count); *enum_object = &object->ID3DXFileEnumObject_iface;

1 0

Robert Wilhelm : vbscript: Implement CDate().
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 6899d16c1642bcbc64908ea19ac8044f63516802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6899d16c1642bcbc64908ea1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri May 20 15:28:35 2022 +0200 vbscript: Implement CDate(). Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 27 +++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..9a24657c848 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,31 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&v, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + + if(!res) + return DISP_E_BADVARTYPE; + *res = v; + return S_OK; } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..3b67e920c3d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,39 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate("1") = #1899-12-31#, "CDate(""1"") = " & CDate("1")) +Call ok(getVT(CDate("1")) = "VT_DATE", "getVT(CDate(""1"")) = " & getVT(CDate("1"))) +If isEnglishLang Then + Call ok(CDate("1/1/2000") = #2000-1-1#, "CDate(""1/1/2000"") = " & CDate("1/1/2000")) + Call ok(getVT(CDate("1/1/2000")) = "VT_DATE", "getVT(CDate(""1/1/2000"")) = " & getVT(CDate("1/1/2000"))) +End If +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) +Call testCDateError(1, 0, 458) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x

1 0

Gabriel Ivăncescu : mshtml: Convert varAsync to bool if needed.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 6ca9da180b43cd7849c2a9e94a28e49e5b16bea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca9da180b43cd7849c2a9e9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 19 21:06:39 2022 +0300 mshtml: Convert varAsync to bool if needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 21 +++++++++++++-------- dlls/mshtml/xmlhttprequest.c | 8 ++++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 0db5cb9717b..868035d0419 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -522,16 +522,21 @@ static void test_responseXML(const WCHAR *expect_text) IDispatch_Release(disp); } -#define xhr_open(a,b) _xhr_open(__LINE__,a,b) -static HRESULT _xhr_open(unsigned line, const WCHAR *url_w, const WCHAR *method_w) +#define xhr_open(a,b,c) _xhr_open(__LINE__,a,b,c) +static HRESULT _xhr_open(unsigned line, const WCHAR *url_w, const WCHAR *method_w, BOOL use_bool) { BSTR method = SysAllocString(method_w); BSTR url = SysAllocString(url_w); VARIANT async, empty; HRESULT hres; - V_VT(&async) = VT_BOOL; - V_BOOL(&async) = VARIANT_TRUE; + if(use_bool) { + V_VT(&async) = VT_BOOL; + V_BOOL(&async) = VARIANT_TRUE; + }else { + V_VT(&async) = VT_I4; + V_I4(&async) = 1; + } V_VT(&empty) = VT_EMPTY; hres = IHTMLXMLHttpRequest_open(xhr, method, url, async, empty, empty); @@ -787,7 +792,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHA ok(val == 0, "Expect UNSENT, got %ld\n", val); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = xhr_open(xml_url, L"GET"); + hres = xhr_open(xml_url, L"GET", TRUE); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); if(FAILED(hres)) { @@ -898,7 +903,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const WCHAR *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(xml_url, L"GET"); + xhr_open(xml_url, L"GET", TRUE); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); @@ -922,7 +927,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const WCHAR *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(xml_url, L"GET"); + xhr_open(xml_url, L"GET", FALSE); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); loading_cnt = 0; @@ -969,7 +974,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) ok(hres == S_OK, "put_onreadystatechange failed: %08lx\n", hres); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(L"http://test.winehq.org/tests/post.php", L"POST"); + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST", FALSE); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); set_request_header(xhr, L"Content-Type", L"application/x-www-form-urlencoded"); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 0ae69df3bda..17219593026 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -508,8 +508,12 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(bstrMethod), debugstr_w(bstrUrl), debugstr_variant(&varAsync), debugstr_variant(&varUser), debugstr_variant(&varPassword)); if(V_VT(&varAsync) != VT_BOOL) { - FIXME("varAsync not supported: %s\n", debugstr_variant(&varAsync)); - return E_FAIL; + LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + hres = VariantChangeTypeEx(&varAsync, &varAsync, lcid, 0, VT_BOOL); + if(FAILED(hres)) { + WARN("Failed to convert varAsync to BOOL: %#lx\n", hres); + return hres; + } } /* Note: Starting with Gecko 30.0 (Firefox 30.0 / Thunderbird 30.0 / SeaMonkey 2.27),

1 0

Gabriel Ivăncescu : mshtml/tests: Add test for clearing timers with id zero.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 5a009e43f9c8066d46064e5a60a32b547e95c716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a009e43f9c8066d46064e5a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 19 21:06:38 2022 +0300 mshtml/tests: Add test for clearing timers with id zero. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4ceee799dd4..95ed071bf78 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2550,6 +2550,9 @@ static void test_timeout(IHTMLDocument2 *doc) ok(hres == S_OK, "setTimeout failed: %08lx\n", hres); ok(id, "id = 0\n"); + hres = IHTMLWindow2_clearTimeout(window, 0); + ok(hres == S_OK, "clearTimeout failed: %08lx\n", hres); + SET_EXPECT(timeout); pump_msgs(&called_timeout); CHECK_CALLED(timeout); @@ -2581,6 +2584,13 @@ static void test_timeout(IHTMLDocument2 *doc) pump_msgs(&called_timeout); CHECK_CALLED(timeout); + hres = IHTMLWindow2_clearInterval(window, 0); + ok(hres == S_OK, "clearInterval failed: %08lx\n", hres); + + SET_EXPECT(timeout); + pump_msgs(&called_timeout); + CHECK_CALLED(timeout); + hres = IHTMLWindow2_clearInterval(window, id); ok(hres == S_OK, "clearTimeout failer: %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Implement window.cancelAnimationFrame.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: a139d25189d203e59d7f79f31c60b73ee3d26118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a139d25189d203e59d7f79f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 19 21:06:37 2022 +0300 mshtml: Implement window.cancelAnimationFrame. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 15 +++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 4 +++- dlls/mshtml/task.c | 23 ++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/dom.js | 10 +++++++++- 6 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ecd530db7e2..235e29a3070 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3152,6 +3152,20 @@ static HRESULT WINAPI window_private_requestAnimationFrame(IWineHTMLWindowPrivat return hres; } +static HRESULT WINAPI window_private_cancelAnimationFrame(IWineHTMLWindowPrivate *iface, VARIANT timer_id) +{ + HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); + HRESULT hres; + + TRACE("iface %p, timer_id %s\n", iface, debugstr_variant(&timer_id)); + + hres = VariantChangeType(&timer_id, &timer_id, 0, VT_I4); + if(SUCCEEDED(hres)) + clear_animation_timer(This->inner_window, V_I4(&timer_id)); + + return S_OK; +} + static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, IDispatch **console) { HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); @@ -3176,6 +3190,7 @@ static const IWineHTMLWindowPrivateVtbl WineHTMLWindowPrivateVtbl = { window_private_GetIDsOfNames, window_private_Invoke, window_private_requestAnimationFrame, + window_private_cancelAnimationFrame, window_private_get_console, }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a94f1be1969..930ab3bbe19 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1247,6 +1247,7 @@ enum timer_type { HRESULT set_task_timer(HTMLInnerWindow*,LONG,enum timer_type,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; +HRESULT clear_animation_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; BOOL parse_compat_version(const WCHAR*,compat_mode_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index b9039c956db..a273e330665 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -87,7 +87,9 @@ interface IWineHTMLWindowPrivate : IDispatch { [id(50)] HRESULT requestAnimationFrame([in] VARIANT *expr, [retval, out] VARIANT *timer_id); - [propget, id(51)] + [id(51)] + HRESULT cancelAnimationFrame([in] VARIANT timer_id); + [propget, id(52)] HRESULT console([retval, out] IDispatch **console); } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 088742e902a..1bb761e1f0f 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -208,7 +208,8 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { if(iter->id == id && iter->window == window) { - release_task_timer(thread_data->thread_hwnd, iter); + if(iter->type != TIMER_ANIMATION_FRAME) + release_task_timer(thread_data->thread_hwnd, iter); return S_OK; } } @@ -217,6 +218,26 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) return S_OK; } +HRESULT clear_animation_timer(HTMLInnerWindow *window, DWORD id) +{ + thread_data_t *thread_data = get_thread_data(FALSE); + task_timer_t *iter; + + if(!thread_data) + return S_OK; + + LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { + if(iter->id == id && iter->window == window) { + if(iter->type == TIMER_ANIMATION_FRAME) + release_task_timer(thread_data->thread_hwnd, iter); + return S_OK; + } + } + + WARN("timer not found\n"); + return S_OK; +} + static const char *debugstr_timer_type(enum timer_type type) { switch(type) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index eeeb1c88430..5f104475f0d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -357,6 +357,7 @@ sync_test("window_props", function() { test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); test_exposed("getComputedStyle", v >= 9); + test_exposed("cancelAnimationFrame", v >= 10); test_exposed("requestAnimationFrame", v >= 10); test_exposed("Map", v >= 11); test_exposed("Set", v >= 11); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index ed5f72c4376..3939dd95642 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -494,13 +494,21 @@ sync_test("elem_props", function() { }); async_test("animation_frame", function() { - var id = requestAnimationFrame(function(x) { + var id = requestAnimationFrame(function(x) { ok(false, "request was supposed to be cancelled"); }); + id = cancelAnimationFrame(id); + ok(id === undefined, "cancelAnimationFrame returned " + id); + + id = requestAnimationFrame(function(x) { ok(this === window, "this != window"); ok(typeof(x) === "number", "x = " + x); ok(arguments.length === 1, "arguments.length = " + arguments.length); next_test(); }); + cancelAnimationFrame(0); + clearInterval(id); + clearTimeout(id); ok(typeof(id) === "number", "id = " + id); + ok(id !== 0, "id = 0"); }); sync_test("title", function() {

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLDOMAttribute2's name property.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 76f5875c9ff6179bff39c382b6075b216bce6326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f5875c9ff6179bff39c382… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 19 21:06:36 2022 +0300 mshtml: Implement HTMLDOMAttribute2's name property. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 6 ++++-- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 7365b9ea63f..82ded4d8a8e 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -285,8 +285,10 @@ static HRESULT WINAPI HTMLDOMAttribute2_Invoke(IHTMLDOMAttribute2 *iface, DISPID static HRESULT WINAPI HTMLDOMAttribute2_get_name(IHTMLDOMAttribute2 *iface, BSTR *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMAttribute_get_nodeName(&This->IHTMLDOMAttribute_iface, p); } static HRESULT WINAPI HTMLDOMAttribute2_put_value(IHTMLDOMAttribute2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1b1e6771ec9..8f78c8da17f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3614,6 +3614,7 @@ static void test_dynamic_properties(IHTMLElement *elem) #define test_attr_node_name(a,b) _test_attr_node_name(__LINE__,a,b) static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const WCHAR *exname) { + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); BSTR str; HRESULT hres; @@ -3621,6 +3622,13 @@ static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const W ok_(__FILE__,line)(hres == S_OK, "get_nodeName failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exname), "node name is %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exname)); SysFreeString(str); + + hres = IHTMLDOMAttribute2_get_name(attr2, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); + ok_(__FILE__,line)(!lstrcmpW(str, exname), "name is %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exname)); + SysFreeString(str); + + IHTMLDOMAttribute2_Release(attr2); } #define test_attr_parent(a) _test_attr_parent(__LINE__,a)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
91
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 May 2022