May 2022 - Wine-Commits - list.winehq.org

Jacek Caban : winemac: Directly use win32u for GDI functions in window.c.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 795ba50a0997179081275cb9ae828568f87138c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=795ba50a0997179081275cb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:20:03 2022 +0200 winemac: Directly use win32u for GDI functions in window.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 56 ++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index d5bcce654e8..e0dc2352d37 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -384,16 +384,16 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { - if (!(hrgn = CreateRectRgn(0, 0, 0, 0))) return; + if (!(hrgn = NtGdiCreateRectRgn(0, 0, 0, 0))) return; if (GetWindowRgn(data->hwnd, hrgn) == ERROR) { - DeleteObject(hrgn); + NtGdiDeleteObjectApp(hrgn); hrgn = 0; } } if (hrgn && GetWindowLongW(data->hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL) - MirrorRgn(data->hwnd, hrgn); + NtUserMirrorRgn(data->hwnd, hrgn); if (hrgn) { OffsetRgn(hrgn, data->window_rect.left - data->whole_rect.left, @@ -428,7 +428,7 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) HeapFree(GetProcessHeap(), 0, region_data); data->shaped = (region_data != NULL); - if (hrgn && hrgn != win_region) DeleteObject(hrgn); + if (hrgn && hrgn != win_region) NtGdiDeleteObjectApp(hrgn); } @@ -678,10 +678,10 @@ static void create_cocoa_window(struct macdrv_win_data *data) BYTE alpha; DWORD layered_flags; - if ((win_rgn = CreateRectRgn(0, 0, 0, 0)) && + if ((win_rgn = NtGdiCreateRectRgn(0, 0, 0, 0)) && GetWindowRgn(data->hwnd, win_rgn) == ERROR) { - DeleteObject(win_rgn); + NtGdiDeleteObjectApp(win_rgn); win_rgn = 0; } data->shaped = (win_rgn != 0); @@ -720,7 +720,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) sync_window_opacity(data, key, alpha, FALSE, layered_flags); done: - if (win_rgn) DeleteObject(win_rgn); + if (win_rgn) NtGdiDeleteObjectApp(win_rgn); } @@ -1053,7 +1053,7 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) RECT *rect; CGRect *cgrect; - if (!hrgn || !(size = GetRegionData(hrgn, 0, NULL))) return NULL; + if (!hrgn || !(size = NtGdiGetRegionData(hrgn, 0, NULL))) return NULL; if (sizeof(CGRect) > sizeof(RECT)) { /* add extra size for CGRect array */ @@ -1061,7 +1061,7 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) size += count * (sizeof(CGRect) - sizeof(RECT)); } if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return NULL; - if (!GetRegionData(hrgn, size, data)) + if (!NtGdiGetRegionData(hrgn, size, data)) { HeapFree(GetProcessHeap(), 0, data); return NULL; @@ -1071,7 +1071,8 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) cgrect = (CGRect *)data->Buffer; if (hdc_lptodp) /* map to device coordinates */ { - LPtoDP(hdc_lptodp, (POINT *)rect, data->rdh.nCount * 2); + NtGdiTransformPoints(hdc_lptodp, (POINT *)rect, (POINT *)rect, + data->rdh.nCount * 2, NtGdiLPtoDP); for (i = 0; i < data->rdh.nCount; i++) { if (rect[i].right < rect[i].left) @@ -1213,16 +1214,16 @@ static void move_window_bits(HWND hwnd, macdrv_window window, const RECT *old_re hdc_src = hdc_dst = GetDCEx(hwnd, 0, DCX_CACHE); } - rgn = CreateRectRgnIndirect(&dst_rect); - SelectClipRgn(hdc_dst, rgn); - DeleteObject(rgn); + rgn = NtGdiCreateRectRgn(dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom); + NtGdiExtSelectClipRgn(hdc_dst, rgn, RGN_COPY); + NtGdiDeleteObjectApp(rgn); ExcludeUpdateRgn(hdc_dst, hwnd); TRACE("copying bits for win %p/%p %s -> %s\n", hwnd, window, wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect)); - BitBlt(hdc_dst, dst_rect.left, dst_rect.top, - dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, - hdc_src, src_rect.left, src_rect.top, SRCCOPY); + NtGdiBitBlt(hdc_dst, dst_rect.left, dst_rect.top, + dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, + hdc_src, src_rect.left, src_rect.top, SRCCOPY, 0, 0); ReleaseDC(hwnd, hdc_dst); if (hdc_src != hdc_dst) ReleaseDC(parent, hdc_src); @@ -1919,26 +1920,27 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, dst_bits = surface->funcs->get_info(surface, bmi); - if (!(dib = CreateDIBSection(info->hdcDst, bmi, DIB_RGB_COLORS, &src_bits, NULL, 0))) goto done; - if (!(hdc = CreateCompatibleDC(0))) goto done; + if (!(dib = NtGdiCreateDIBSection(info->hdcDst, NULL, 0, bmi, DIB_RGB_COLORS, + 0, 0, 0, &src_bits))) goto done; + if (!(hdc = NtGdiCreateCompatibleDC(0))) goto done; - SelectObject(hdc, dib); + NtGdiSelectBitmap(hdc, dib); if (info->prcDirty) { IntersectRect(&rect, &rect, info->prcDirty); surface->funcs->lock(surface); memcpy(src_bits, dst_bits, bmi->bmiHeader.biSizeImage); surface->funcs->unlock(surface); - PatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); + NtGdiPatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); } src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); - DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + NtGdiTransformPoints(info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP); - if (!(ret = GdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, src_rect.left, src_rect.top, - src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, - blend))) + if (!(ret = NtGdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, + blend, 0))) goto done; if ((data = get_win_data(hwnd))) @@ -1960,8 +1962,8 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, done: window_surface_release(surface); - if (hdc) DeleteDC(hdc); - if (dib) DeleteObject(dib); + if (hdc) NtGdiDeleteObjectApp(hdc); + if (dib) NtGdiDeleteObjectApp(dib); return ret; }

1 0

Matteo Bruni : d3dx9: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard May 20, 2022

May 20, 2022

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 May 20, 2022

May 20, 2022

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 May 20, 2022

May 20, 2022

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

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

May 20, 2022

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

Tag wine-7.9 : Alexandre Julliard : Release 7.9
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: refs/tags/wine-7.9 Tag: 485d1a5629492ffd4d5c64d8ca6f3d2fafccc4e5 URL: https://source.winehq.org/git/wine.git/?a=tag;h=485d1a5629492ffd4d5c64d8ca6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 22:24:58 2022 +0200 Release 7.9

1 0

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

May 20, 2022

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 HTMLDOMAttribute2's name property.
by Alexandre Julliard May 20, 2022

May 20, 2022

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

Torge Matthies : win32u: Query basic instead of full key information to get the LastWriteTime.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 970405df1c71973bb1c0c089d3dbac6004bea81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=970405df1c71973bb1c0c089… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 02:11:27 2022 +0200 win32u: Query basic instead of full key information to get the LastWriteTime. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 136f47672d0..b68bfa3a7ce 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1246,7 +1246,7 @@ static void clear_display_devices(void) static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, monitor_count = 0, size; - KEY_FULL_INFORMATION key; + KEY_BASIC_INFORMATION key; struct adapter *adapter; struct monitor *monitor; HANDLE mutex = NULL; @@ -1258,8 +1258,8 @@ static BOOL update_display_cache_from_registry(void) sizeof(devicemap_video_keyW) ))) return FALSE; - status = NtQueryKey( video_key, KeyFullInformation, &key, - offsetof(KEY_FULL_INFORMATION, Class), &size ); + status = NtQueryKey( video_key, KeyBasicInformation, &key, + offsetof(KEY_BASIC_INFORMATION, Name), &size ); if (status && status != STATUS_BUFFER_OVERFLOW) return FALSE;

1 0

Torge Matthies : win32u: Calculate buffer sizes from registry structs correctly.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 32d557142cc6a0f4140911561d4e553f3891243f URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d557142cc6a0f414091156… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 02:03:20 2022 +0200 win32u: Calculate buffer sizes from registry structs correctly. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 8a99e4095f9..136f47672d0 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1258,7 +1258,8 @@ static BOOL update_display_cache_from_registry(void) sizeof(devicemap_video_keyW) ))) return FALSE; - status = NtQueryKey( video_key, KeyFullInformation, &key, sizeof(key), &size ); + status = NtQueryKey( video_key, KeyFullInformation, &key, + offsetof(KEY_FULL_INFORMATION, Class), &size ); if (status && status != STATUS_BUFFER_OVERFLOW) return FALSE; @@ -3210,7 +3211,7 @@ void sysparams_init(void) if ((hkey = reg_open_key( config_key, software_fontsW, sizeof(software_fontsW) ))) { - char buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD)]; + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; if (query_reg_value( hkey, log_pixelsW, value, sizeof(buffer) ) && value->Type == REG_DWORD)

1 0