July 2017 - Wine-commits - list.winehq.org

Jactry Zeng : kernel32: Add stub for ResolveLocaleName.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: b9a9fe4a042f98521efea3275ded4af4b7cba4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a9fe4a042f98521efea3275… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jun 28 15:05:21 2017 +0800 kernel32: Add stub for ResolveLocaleName. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnls.h | 1 + 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 31abadc..1e9ea4a 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub NlsUpdateLocale @ stub NlsUpdateSystemLocale @ stub NlsWriteEtwEvent -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW @ stdcall SetThreadLocale(long) kernel32.SetThreadLocale diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index bdbcbb8..49c6d2e 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -47,7 +47,7 @@ @ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx @ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW @ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW @ stub SetProcessPreferredUILanguages diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 98ec923..6272d01 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -48,7 +48,7 @@ @ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx @ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW @ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW @ stub SetProcessPreferredUILanguages diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1a11af5..7ba1978 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1281,7 +1281,7 @@ @ stdcall ResetEvent(long) @ stdcall ResetWriteWatch(ptr long) @ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) ntdll.LdrResolveDelayLoadedAPI -# @ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a72a8aa..64966e5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5893,3 +5893,15 @@ BOOL WINAPI GetFileMUIInfo(DWORD flags, PCWSTR path, FILEMUIINFO *info, DWORD *s SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/****************************************************************************** + * ResolveLocaleName (KERNEL32.@) + */ + +INT WINAPI ResolveLocaleName(LPCWSTR name, LPWSTR localename, INT len) +{ + FIXME("stub: %s, %p, %d\n", wine_dbgstr_w(name), localename, len); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index bb80f21..5dc6fa6 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1345,7 +1345,7 @@ @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch @ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI # @ stub ResolveDelayLoadsFromDll -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall RestoreLastError(long) kernel32.RestoreLastError @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall RevertToSelf() advapi32.RevertToSelf diff --git a/include/winnls.h b/include/winnls.h index 470acf84..8cb8af6 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -950,6 +950,7 @@ WINBASEAPI INT WINAPI LCMapStringEx(LPCWSTR,DWORD,LPCWSTR,INT,LPWSTR,INT WINBASEAPI LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); WINBASEAPI INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); WINNORMALIZEAPI INT WINAPI NormalizeString(NORM_FORM,LPCWSTR,INT,LPWSTR,INT); +WINBASEAPI INT WINAPI ResolveLocaleName(LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); WINBASEAPI INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)

1 0

Zebediah Figura : user32: Allow activating the desktop window.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: ae153a5c2c5590d4ea722d38eb4ddf1a7031f34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae153a5c2c5590d4ea722d38e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 7 18:58:12 2017 -0500 user32: Allow activating the desktop window. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 61a1543..3d3736d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1871,7 +1871,6 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR if (is_desktop_window( hwnd )) return 0; return WIN_SetStyle(hwnd, wparam, lparam); case WM_WINE_SETACTIVEWINDOW: - if (is_desktop_window( hwnd )) return 0; if (!wparam && GetForegroundWindow() == hwnd) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: @@ -2645,7 +2644,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hwndTop = GetParent( hwndTop ); } - if (hwndTop && hwndTop != GetDesktopWindow()) + if (hwndTop) { LONG ret = SendMessageW( msg->hwnd, WM_MOUSEACTIVATE, (WPARAM)hwndTop, MAKELONG( hittest, msg->message ) );

1 0

Mark Jansen : shell32: Prevent a possible null pointer dereference in SHGetFileInfoW.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 32520439e18e5cfb666dd8d28324a1f16249d3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32520439e18e5cfb666dd8d28… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Wed Jul 19 17:23:07 2017 +0200 shell32: Prevent a possible null pointer dereference in SHGetFileInfoW. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 34b906c..0ed6790 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -431,7 +431,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, - psfi, psfi->dwAttributes, sizeofpsfi, flags); + psfi, psfi ? psfi->dwAttributes : 0, sizeofpsfi, flags); if (!path) return FALSE;

1 0

Sebastian Lackner : configure: Improve check for if_nameindex.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 45284246617cd0bf7555e12abf763be34b923ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45284246617cd0bf7555e12ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 19 17:26:11 2017 +0200 configure: Improve check for if_nameindex. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 58d5929..c099dba 100755 --- a/configure +++ b/configure @@ -16406,6 +16406,9 @@ else #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif diff --git a/configure.ac b/configure.ac index ab4203c..533f1e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2248,6 +2248,9 @@ AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif]],

1 0

Piotr Caban : gdiplus: Store newer gdi+ version in created GdipRegions.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 55453327f55afa550499c2d639f13094dd1963db URL: http://source.winehq.org/git/wine.git/?a=commit;h=55453327f55afa550499c2d63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 18 18:59:40 2017 +0200 gdiplus: Store newer gdi+ version in created GdipRegions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 4 ++-- dlls/gdiplus/tests/region.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 390b50f..a905f0d 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -764,7 +764,7 @@ static void write_element(const region_element* element, DWORD *buffer, else pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; pathheader->size += get_pathtypes_size(path); - pathheader->magic = VERSION_MAGIC; + pathheader->magic = VERSION_MAGIC2; pathheader->count = path->pathdata.Count; *filled += 4; @@ -852,7 +852,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, region_header = (struct region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; - region_header->magic = VERSION_MAGIC; + region_header->magic = VERSION_MAGIC2; region_header->num_children = region->num_children; filled += 4; /* With few exceptions, everything written is DWORD aligned, diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d4d8772..2bf4470 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -37,7 +37,7 @@ #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) -#define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) +#define expect_magic(value) ok(broken(*(value) == RGNDATA_MAGIC) || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) #define expect_dword(value, expected) expect((expected), *(value)) #define expect_float(value, expected) expectf((expected), *(FLOAT *)(value))

1 0

Piotr Caban : gdiplus: Add write_path_data helper to create EMF+ path object.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: a892b6801667fc3aa213c7c15027e1919308877c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a892b6801667fc3aa213c7c15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 18 18:59:48 2017 +0200 gdiplus: Add write_path_data helper to create EMF+ path object. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphicspath.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/metafile.c | 27 +++------------ 3 files changed, 80 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6806cc..762aa13 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -124,6 +124,8 @@ extern void free_installed_fonts(void) DECLSPEC_HIDDEN; extern BOOL lengthen_path(GpPath *path, INT len) DECLSPEC_HIDDEN; +extern DWORD write_path_data(GpPath *path, void *data) DECLSPEC_HIDDEN; + extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index e190532..05c7982 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2454,3 +2454,77 @@ GpStatus WINGDIPAPI GdipWindingModeOutline(GpPath *path, GpMatrix *matrix, REAL FIXME("stub: %p, %p, %.2f\n", path, matrix, flatness); return NotImplemented; } + +#define FLAGS_INTPATH 0x4000 + +struct path_header +{ + DWORD version; + DWORD count; + DWORD flags; +}; + +/* Test to see if the path could be stored as an array of shorts */ +static BOOL is_integer_path(const GpPath *path) +{ + int i; + + if (!path->pathdata.Count) return FALSE; + + for (i = 0; i < path->pathdata.Count; i++) + { + short x, y; + x = gdip_round(path->pathdata.Points[i].X); + y = gdip_round(path->pathdata.Points[i].Y); + if (path->pathdata.Points[i].X != (REAL)x || path->pathdata.Points[i].Y != (REAL)y) + return FALSE; + } + return TRUE; +} + +DWORD write_path_data(GpPath *path, void *data) +{ + struct path_header *header = data; + BOOL integer_path = is_integer_path(path); + DWORD i, size; + BYTE *types; + + size = sizeof(struct path_header) + path->pathdata.Count; + if (integer_path) + size += sizeof(short[2]) * path->pathdata.Count; + else + size += sizeof(float[2]) * path->pathdata.Count; + size = (size + 3) & ~3; + + if (!data) return size; + + header->version = VERSION_MAGIC2; + header->count = path->pathdata.Count; + header->flags = integer_path ? FLAGS_INTPATH : 0; + + if (integer_path) + { + short *points = (short*)(header + 1); + for (i = 0; i < path->pathdata.Count; i++) + { + points[2*i] = path->pathdata.Points[i].X; + points[2*i + 1] = path->pathdata.Points[i].Y; + } + types = (BYTE*)(points + 2*i); + } + else + { + float *points = (float*)(header + 1); + for (i = 0; i < path->pathdata.Count; i++) + { + points[2*i] = path->pathdata.Points[i].X; + points[2*i + 1] = path->pathdata.Points[i].Y; + } + types = (BYTE*)(points + 2*i); + } + + for (i=0; i<path->pathdata.Count; i++) + types[i] = path->pathdata.Types[i]; + memset(types + i, 0, ((path->pathdata.Count + 3) & ~3) - path->pathdata.Count); + return size; +} diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d53c85f..c3895ed 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2698,42 +2698,23 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD *id) { EmfPlusObject *object_record; - EmfPlusPointF *points; - BYTE *types; GpStatus stat; - DWORD i, size; + DWORD size; *id = -1; if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; - /* TODO: Add support for more point formats */ - size = sizeof(EmfPlusPointF)*path->pathdata.Count + path->pathdata.Count; - size = (size + 3) & ~3; - + size = write_path_data(path, NULL); stat = METAFILE_AllocateRecord(metafile, - FIELD_OFFSET(EmfPlusObject, ObjectData.path.data[size]), + FIELD_OFFSET(EmfPlusObject, ObjectData.path) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePath << 8; - - object_record->ObjectData.path.Version = 0xDBC01002; - object_record->ObjectData.path.PathPointCount = path->pathdata.Count; - object_record->ObjectData.path.PathPointFlags = 0; - - points = (EmfPlusPointF*)object_record->ObjectData.path.data; - for (i=0; i<path->pathdata.Count; i++) - { - points[i].X = path->pathdata.Points[i].X; - points[i].Y = path->pathdata.Points[i].Y; - } - - types = (BYTE*)(points + path->pathdata.Count); - for (i=0; i<path->pathdata.Count; i++) - types[i] = path->pathdata.Types[i]; + write_path_data(path, &object_record->ObjectData.path); return Ok; }

1 0

Piotr Caban : gdiplus: Use write_path_data helper in GdipGetRegionData.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 58eb74c43d7bde2ed41a405a6cd9b4addffb1cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=58eb74c43d7bde2ed41a405a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 18 18:59:55 2017 +0200 gdiplus: Use write_path_data helper in GdipGetRegionData. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 106 +++----------------------------------------------- 1 file changed, 5 insertions(+), 101 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index a905f0d..74c02c2 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -74,7 +74,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * */ -#define FLAGS_NOFLAGS 0x0 #define FLAGS_INTPATH 0x4000 struct memory_buffer @@ -110,35 +109,6 @@ typedef struct packed_point short Y; } packed_point; -/* Test to see if the path could be stored as an array of shorts */ -static BOOL is_integer_path(const GpPath *path) -{ - int i; - - if (!path->pathdata.Count) return FALSE; - - for (i = 0; i < path->pathdata.Count; i++) - { - short x, y; - x = gdip_round(path->pathdata.Points[i].X); - y = gdip_round(path->pathdata.Points[i].Y); - if (path->pathdata.Points[i].X != (REAL)x || path->pathdata.Points[i].Y != (REAL)y) - return FALSE; - } - return TRUE; -} - -/* Everything is measured in DWORDS; round up if there's a remainder */ -static inline INT get_pathtypes_size(const GpPath* path) -{ - INT needed = path->pathdata.Count / sizeof(DWORD); - - if (path->pathdata.Count % sizeof(DWORD) > 0) - needed++; - - return needed * sizeof(DWORD); -} - static inline INT get_element_size(const region_element* element) { INT needed = sizeof(DWORD); /* DWORD for the type */ @@ -148,17 +118,8 @@ static inline INT get_element_size(const region_element* element) return needed + sizeof(GpRect); case RegionDataPath: { - const GpPath *path = element->elementdata.path; - DWORD flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; - /* 3 for headers, once again size doesn't count itself */ - needed += sizeof(DWORD) * 3; - if (flags & FLAGS_INTPATH) - needed += 2 * sizeof(SHORT) * path->pathdata.Count; - else - needed += 2 * sizeof(FLOAT) * path->pathdata.Count; - - needed += get_pathtypes_size(path); - needed += sizeof(DWORD); /* Extra DWORD for pathheader.size */ + needed += write_path_data(element->elementdata.path, NULL); + needed += sizeof(DWORD); /* Extra DWORD for path size */ return needed; } case RegionDataEmptyRect: @@ -704,29 +665,6 @@ static inline void write_float(DWORD* location, INT* offset, const FLOAT write) (*offset)++; } -static inline void write_packed_point(DWORD* location, INT* offset, - const GpPointF* write) -{ - packed_point *point = (packed_point *)(location + *offset); - point->X = gdip_round(write->X); - point->Y = gdip_round(write->Y); - (*offset)++; -} - -static inline void write_path_types(DWORD* location, INT* offset, - const GpPath* path) -{ - INT rounded_size = get_pathtypes_size(path); - - memcpy(location + *offset, path->pathdata.Types, path->pathdata.Count); - - /* The unwritten parts of the DWORD (if any) must be cleared */ - if (rounded_size - path->pathdata.Count) - ZeroMemory(((BYTE*)location) + (*offset * sizeof(DWORD)) + - path->pathdata.Count, rounded_size - path->pathdata.Count); - *offset += rounded_size / sizeof(DWORD); -} - static void write_element(const region_element* element, DWORD *buffer, INT* filled) { @@ -750,43 +688,9 @@ static void write_element(const region_element* element, DWORD *buffer, break; case RegionDataPath: { - INT i; - const GpPath* path = element->elementdata.path; - struct path_header *pathheader; - - pathheader = (struct path_header *)(buffer + *filled); - - pathheader->flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; - /* 3 for headers, once again size doesn't count itself */ - pathheader->size = sizeof(DWORD) * 3; - if (pathheader->flags & FLAGS_INTPATH) - pathheader->size += 2 * sizeof(SHORT) * path->pathdata.Count; - else - pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; - pathheader->size += get_pathtypes_size(path); - pathheader->magic = VERSION_MAGIC2; - pathheader->count = path->pathdata.Count; - - *filled += 4; - - switch (pathheader->flags & FLAGS_INTPATH) - { - case FLAGS_NOFLAGS: - for (i = 0; i < path->pathdata.Count; i++) - { - write_float(buffer, filled, path->pathdata.Points[i].X); - write_float(buffer, filled, path->pathdata.Points[i].Y); - } - break; - case FLAGS_INTPATH: - for (i = 0; i < path->pathdata.Count; i++) - { - write_packed_point(buffer, filled, - &path->pathdata.Points[i]); - } - break; - } - write_path_types(buffer, filled, path); + DWORD size = write_path_data(element->elementdata.path, buffer + *filled + 1); + write_dword(buffer, filled, size); + *filled += size / sizeof(DWORD); break; } case RegionDataEmptyRect:

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3 stub implementation.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 821c47688748b6e7a9e6ec7925c45ebf4fde0af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821c47688748b6e7a9e6ec792… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 20:32:40 2017 +0200 mshtml: Added IHTMLDOMNode3 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 205 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 206 insertions(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f49889d..ae63e03 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1153,6 +1153,208 @@ static const IHTMLDOMNode2Vtbl HTMLDOMNode2Vtbl = { HTMLDOMNode2_get_ownerDocument }; +static inline HTMLDOMNode *impl_from_IHTMLDOMNode3(IHTMLDOMNode3 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLDOMNode3_iface); +} + +static HRESULT WINAPI HTMLDOMNode3_QueryInterface(IHTMLDOMNode3 *iface, REFIID riid, void **ppv) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IHTMLDOMNode_QueryInterface(&This->IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMNode3_AddRef(IHTMLDOMNode3 *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + + return IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLDOMNode3_Release(IHTMLDOMNode3 *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + + return IHTMLDOMNode_Release(&This->IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLDOMNode3_GetTypeInfoCount(IHTMLDOMNode3 *iface, UINT *pctinfo) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMNode3_GetTypeInfo(IHTMLDOMNode3 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMNode3_GetIDsOfNames(IHTMLDOMNode3 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMNode3_Invoke(IHTMLDOMNode3 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMNode3_put_prefix(IHTMLDOMNode3 *iface, VARIANT v) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_prefix(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_localName(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isEqualNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isEqual) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_lookupNamespaceURI(IHTMLDOMNode3 *iface, VARIANT *prefix, VARIANT *namespaceURI) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(prefix), namespaceURI); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_lookupPrefix(IHTMLDOMNode3 *iface, VARIANT *namespaceURI, VARIANT *prefix) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(namespaceURI), prefix); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isDefaultNamespace(IHTMLDOMNode3 *iface, VARIANT *namespace, VARIANT_BOOL *pfDefaultNamespace) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_appendChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_insertBefore(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, VARIANT refChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_removeChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p %p)\n", This, oldChild, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_replaceChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isSameNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isSame) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_compareDocumentPosition(IHTMLDOMNode3 *iface, IHTMLDOMNode *otherNode, USHORT *flags) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isSupported(IHTMLDOMNode3 *iface, BSTR feature, VARIANT version, VARIANT_BOOL *pfisSupported) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(feature), debugstr_variant(&version), pfisSupported); + return E_NOTIMPL; +} + +static const IHTMLDOMNode3Vtbl HTMLDOMNode3Vtbl = { + HTMLDOMNode3_QueryInterface, + HTMLDOMNode3_AddRef, + HTMLDOMNode3_Release, + HTMLDOMNode3_GetTypeInfoCount, + HTMLDOMNode3_GetTypeInfo, + HTMLDOMNode3_GetIDsOfNames, + HTMLDOMNode3_Invoke, + HTMLDOMNode3_put_prefix, + HTMLDOMNode3_get_prefix, + HTMLDOMNode3_get_localName, + HTMLDOMNode3_get_namespaceURI, + HTMLDOMNode3_put_textContent, + HTMLDOMNode3_get_textContent, + HTMLDOMNode3_isEqualNode, + HTMLDOMNode3_lookupNamespaceURI, + HTMLDOMNode3_lookupPrefix, + HTMLDOMNode3_isDefaultNamespace, + HTMLDOMNode3_appendChild, + HTMLDOMNode3_insertBefore, + HTMLDOMNode3_removeChild, + HTMLDOMNode3_replaceChild, + HTMLDOMNode3_isSameNode, + HTMLDOMNode3_compareDocumentPosition, + HTMLDOMNode3_isSupported +}; + HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) { TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -1165,6 +1367,8 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode_iface; }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { *ppv = &This->IHTMLDOMNode2_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) { + *ppv = &This->IHTMLDOMNode3_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; return S_OK; @@ -1213,6 +1417,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; + node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; ccref_init(&node->ccref, 1); init_event_target(&node->event_target); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a51631c..3c32ffe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -725,6 +725,7 @@ struct HTMLDOMNode { EventTarget event_target; IHTMLDOMNode IHTMLDOMNode_iface; IHTMLDOMNode2 IHTMLDOMNode2_iface; + IHTMLDOMNode3 IHTMLDOMNode3_iface; const NodeImplVtbl *vtbl; nsCycleCollectingAutoRefCnt ccref;

1 0

Jacek Caban : mshtml: Forward duplicated IHTMLDOMNode3 functions to IHTMLDOMNode implementation.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 03b80411195bb500e3efc6af073901c51fd1a0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b80411195bb500e3efc6af0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 20:32:49 2017 +0200 mshtml: Forward duplicated IHTMLDOMNode3 functions to IHTMLDOMNode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ae63e03..d3c1473 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1282,29 +1282,29 @@ static HRESULT WINAPI HTMLDOMNode3_isDefaultNamespace(IHTMLDOMNode3 *iface, VARI static HRESULT WINAPI HTMLDOMNode3_appendChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + TRACE("(%p)->()\n", This); + return IHTMLDOMNode_appendChild(&This->IHTMLDOMNode_iface, newChild, node); } static HRESULT WINAPI HTMLDOMNode3_insertBefore(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, VARIANT refChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); - return E_NOTIMPL; + TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); + return IHTMLDOMNode_insertBefore(&This->IHTMLDOMNode_iface, newChild, refChild, node); } static HRESULT WINAPI HTMLDOMNode3_removeChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p %p)\n", This, oldChild, node); - return E_NOTIMPL; + TRACE("(%p)->(%p %p)\n", This, oldChild, node); + return IHTMLDOMNode_removeChild(&This->IHTMLDOMNode_iface, oldChild, node); } static HRESULT WINAPI HTMLDOMNode3_replaceChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); + return IHTMLDOMNode_replaceChild(&This->IHTMLDOMNode_iface, newChild, oldChild, node); } static HRESULT WINAPI HTMLDOMNode3_isSameNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isSame)

1 0

Jacek Caban : mshtml: Expose IHTMLDOMNode3 interface to scripts.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: d4be45fc9ab663aaa40be16566da1b68ee1b0ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4be45fc9ab663aaa40be1656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 20:32:55 2017 +0200 mshtml: Expose IHTMLDOMNode3 interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlnode.c | 9 ++++++++- dlls/mshtml/htmltextnode.c | 7 ++++--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/documentmode.js | 2 ++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4f7a383..dd23517 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5176,6 +5176,8 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const DISPID elem2_ie11_blacklist[] = {DISPID_IHTMLELEMENT2_DOSCROLL, DISPID_UNKNOWN}; + HTMLDOMNode_init_dispex_info(info, mode); + dispex_info_add_interface(info, IHTMLElement2_tid, mode >= COMPAT_MODE_IE11 ? elem2_ie11_blacklist : NULL); if(mode >= COMPAT_MODE_IE8) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d3c1473..8202803 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -436,7 +436,8 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { &HTMLDOMChildrenCollection_dispex_vtbl, DispDOMChildrenCollection_tid, - HTMLDOMChildrenCollection_iface_tids + HTMLDOMChildrenCollection_iface_tids, + HTMLDOMNode_init_dispex_info }; IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) @@ -1401,6 +1402,12 @@ static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMN return create_node(This->doc, nsnode, ret); } +void HTMLDOMNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLDOMNode3_tid, NULL); +} + static const cpc_entry_t HTMLDOMNode_cpc[] = {{NULL}}; static const NodeImplVtbl HTMLDOMNodeImplVtbl = { diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index edf8efd..a5587c1 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -361,7 +361,8 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = { static dispex_static_data_t HTMLDOMTextNode_dispex = { NULL, DispHTMLDOMTextNode_tid, - HTMLDOMTextNode_iface_tids + HTMLDOMTextNode_iface_tids, + HTMLDOMNode_init_dispex_info }; HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **node) @@ -377,8 +378,8 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; ret->IHTMLDOMTextNode2_iface.lpVtbl = &HTMLDOMTextNode2Vtbl; - init_dispex(&ret->node.event_target.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, - &HTMLDOMTextNode_dispex); + init_dispex_with_compat_mode(&ret->node.event_target.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, + &HTMLDOMTextNode_dispex, doc->document_mode); HTMLDOMNode_Init(doc, &ret->node, nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3c32ffe..9bdb0844 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -151,6 +151,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMImplementation) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ + XIID(IHTMLDOMNode3) \ XIID(IHTMLDOMTextNode) \ XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ @@ -1039,6 +1040,7 @@ void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,disp HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; +void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t) DECLSPEC_HIDDEN; HRESULT HTMLElement_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLElement_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a7340e2..84138e7 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -32,6 +32,8 @@ function test_elem_props() { test_exposed("doScroll", v < 11); test_exposed("querySelectorAll", v >= 8); + test_exposed("textContent", v >= 9); + test_exposed("prefix", v >= 9); next_test(); }

1 0