July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add stream offsets in device_stream_info_from_declaration().
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: 7ee4bda63efbc635ec4456feeed4f45c888ca4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee4bda63efbc635ec4456fee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 15 01:14:50 2011 +0200 wined3d: Add stream offsets in device_stream_info_from_declaration(). They're not going to change until the next time the stream info is updated. This would of course mainly be useful if we managed to do more than one or two draws with the same stream info. --- dlls/wined3d/buffer.c | 3 +- dlls/wined3d/device.c | 7 ++++- dlls/wined3d/drawprim.c | 17 ++++++-------- dlls/wined3d/state.c | 53 ++++++++++++++++++---------------------------- 4 files changed, 34 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ee4bda63efbc635ec445…

1 0

Alexandre Julliard : netapi32/tests: Don' t crash if the administrators group is missing.
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: bc8a2b1fb96f91496f241726d7b9c3fc5b03b750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8a2b1fb96f91496f241726d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 09:59:26 2011 +0200 netapi32/tests: Don't crash if the administrators group is missing. --- dlls/netapi32/tests/access.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index e8324d3..9726c8d 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -332,7 +332,9 @@ static void run_localgroupgetinfo_tests(void) int i; status = pNetLocalGroupGetInfo(NULL, admins, 1, (LPBYTE *)&lgi); - ok(status == NERR_Success, "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + ok(status == NERR_Success || broken(status == NERR_GroupNotFound), + "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + if (status != NERR_Success) return; trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); trace("Comment: %s\n", wine_dbgstr_w( lgi->lgrpi1_comment));

1 0

Jacek Caban : widl: Produce __uuidof-compatible headers.
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: 2b7c6a9599f3cf6b00bd9bee62c27d8ce16e4240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7c6a9599f3cf6b00bd9bee6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 14 17:21:45 2011 +0200 widl: Produce __uuidof-compatible headers. --- tools/widl/header.c | 74 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 48 insertions(+), 26 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 7569995..9d20a3e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -129,6 +129,28 @@ void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID * uuid->Data4[6], uuid->Data4[7]); } +static void write_uuid_decl(FILE *f, const char *name, const UUID *uuid) +{ + fprintf(f, "#ifdef __CRT_UUID_DECL\n"); + fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," + "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", + name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], + uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], + uuid->Data4[7]); + fprintf(f, "#endif\n"); +} + +static const char *uuid_string(const UUID *uuid) +{ + static char buf[37]; + + sprintf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], uuid->Data4[2], + uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]); + + return buf; +} + const char *get_name(const var_t *v) { static char buffer[256]; @@ -1014,24 +1036,6 @@ static void write_forward(FILE *header, type_t *iface) fprintf(header, "#endif\n\n" ); } -static void write_iface_guid(FILE *header, const type_t *iface) -{ - const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); - write_guid(header, "IID", iface->name, uuid); -} - -static void write_dispiface_guid(FILE *header, const type_t *iface) -{ - const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); - write_guid(header, "DIID", iface->name, uuid); -} - -static void write_coclass_guid(FILE *header, const type_t *cocl) -{ - const UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID); - write_guid(header, "CLSID", cocl->name, uuid); -} - static void write_com_interface_start(FILE *header, const type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); @@ -1045,21 +1049,26 @@ static void write_com_interface_start(FILE *header, const type_t *iface) static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); - if (dispinterface) - write_dispiface_guid(header, iface); - else - write_iface_guid(header, iface); + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + + if (uuid) + write_guid(header, dispinterface ? "DIID" : "IID", iface->name, uuid); + /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); + if (uuid) + fprintf(header, "MIDL_INTERFACE(\"%s\")\n", uuid_string(uuid)); + else + fprintf(header, "interface "); if (type_iface_get_inherit(iface)) { - fprintf(header, "interface %s : public %s\n", iface->name, + fprintf(header, "%s : public %s\n", iface->name, type_iface_get_inherit(iface)->name); fprintf(header, "{\n"); } else { - fprintf(header, "interface %s\n", iface->name); + fprintf(header, "%s\n", iface->name); fprintf(header, "{\n"); fprintf(header, " BEGIN_INTERFACE\n"); fprintf(header, "\n"); @@ -1075,6 +1084,8 @@ static void write_com_interface_end(FILE *header, type_t *iface) if (!type_iface_get_inherit(iface)) fprintf(header, " END_INTERFACE\n"); fprintf(header, "};\n"); + if (uuid) + write_uuid_decl(header, iface->name, uuid); fprintf(header, "#else\n"); /* C interface */ fprintf(header, "typedef struct %sVtbl {\n", iface->name); @@ -1148,12 +1159,23 @@ static void write_rpc_interface_end(FILE *header, const type_t *iface) static void write_coclass(FILE *header, type_t *cocl) { + const UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID); + fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s coclass\n", cocl->name); fprintf(header, " */\n\n"); - write_coclass_guid(header, cocl); + if (uuid) + write_guid(header, "CLSID", cocl->name, uuid); fprintf(header, "\n#ifdef __cplusplus\n"); - fprintf(header, "class %s;\n", cocl->name); + if (uuid) + { + fprintf(header, "class DECLSPEC_UUID(\"%s\") %s;\n", uuid_string(uuid), cocl->name); + write_uuid_decl(header, cocl->name, uuid); + } + else + { + fprintf(header, "class %s;\n", cocl->name); + } fprintf(header, "#endif\n"); fprintf(header, "\n"); }

1 0

Rafał Mużyło : avicap32: Drop v4l1 support.
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: 898d8abc16128d4fe89eaad214abe1c028fe8dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=898d8abc16128d4fe89eaad21… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Thu Jul 14 21:38:14 2011 +0200 avicap32: Drop v4l1 support. --- configure | 9 +++++---- configure.ac | 2 +- dlls/avicap32/avicap32_main.c | 32 ++++++++------------------------ include/config.h.in | 3 +++ 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 2694c59..0e05074 100755 --- a/configure +++ b/configure @@ -6133,9 +6133,10 @@ fi done -for ac_header in linux/videodev.h +for ac_header in linux/videodev.h linux/videodev2.h do : - ac_fn_c_check_header_compile "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "#ifdef HAVE_SYS_TIME_H + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif #include <sys/types.h> @@ -6143,9 +6144,9 @@ do : #include <asm/types.h> #endif " -if test "x$ac_cv_header_linux_videodev_h" = xyes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LINUX_VIDEODEV_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi diff --git a/configure.ac b/configure.ac index dccc4d3..afc937f 100644 --- a/configure.ac +++ b/configure.ac @@ -642,7 +642,7 @@ AC_CHECK_HEADERS([pthread_np.h],,, #include <pthread.h> #endif]) -AC_CHECK_HEADERS([linux/videodev.h],,, +AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h],,, [#ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 349ee5d..3d0b661 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -38,8 +38,8 @@ #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> #endif -#ifdef HAVE_LINUX_VIDEODEV_H -# include <linux/videodev.h> +#ifdef HAVE_LINUX_VIDEODEV2_H +# include <linux/videodev2.h> #endif #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -91,7 +91,7 @@ HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, return retW; } -#ifdef HAVE_LINUX_VIDEODEV_H +#ifdef HAVE_LINUX_VIDEODEV2_H static int xioctl(int fd, int request, void * arg) { @@ -108,10 +108,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi int fd; char device[16]; struct stat st; - struct video_capability capa; -#ifdef HAVE_V4L2 struct v4l2_capability caps; -#endif snprintf(device, sizeof(device), "/dev/video%i", devnum); @@ -132,7 +129,6 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi return FALSE; } -#ifdef HAVE_V4L2 memset(&caps, 0, sizeof(caps)); if (xioctl(fd, VIDIOC_QUERYCAP, &caps) != -1) { lstrcpynA(name, (char *)caps.card, namesize); @@ -143,27 +139,15 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi } if (errno != EINVAL && errno != 515) - WARN("%s: ioctl failed: %s -- Falling back to V4L\n", device, strerror(errno)); - else WARN("%s: Not a V4L2 compatible device, trying V4l 1\n", device); -#endif /* HAVE_V4L2 */ - - memset(&capa, 0, sizeof(capa)); - if (xioctl(fd, VIDIOCGCAP, &capa) == -1) { /* errno 515 is used by some webcam drivers for unknown IOICTL command */ - if (errno != EINVAL && errno != 515) - ERR("%s: Querying failed: %s\n", device, strerror(errno)); - else ERR("%s: Querying failed: Not a V4L compatible device\n", device); - close(fd); - return FALSE; - } + ERR("%s: Querying failed: %s\n", device, strerror(errno)); + else ERR("%s: Querying failed: Not a V4L compatible device\n", device); - lstrcpynA(name, capa.name, namesize); - lstrcpynA(version, device, versionsize); close(fd); - return TRUE; + return FALSE; } -#else /* HAVE_LINUX_VIDEODEV_H */ +#else /* HAVE_LINUX_VIDEODEV2_H */ static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize) { @@ -171,7 +155,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi return FALSE; } -#endif /* HAVE_LINUX_VIDEODEV_H */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ /*********************************************************************** * capGetDriverDescriptionA (AVICAP32.@) diff --git a/include/config.h.in b/include/config.h.in index 04507e0..6758bc6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -446,6 +446,9 @@ /* Define to 1 if you have the <linux/ucdrom.h> header file. */ #undef HAVE_LINUX_UCDROM_H +/* Define to 1 if you have the <linux/videodev2.h> header file. */ +#undef HAVE_LINUX_VIDEODEV2_H + /* Define to 1 if you have the <linux/videodev.h> header file. */ #undef HAVE_LINUX_VIDEODEV_H

1 0

Alexandre Julliard : gdi32/tests: Fix some test failures on Windows.
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: 7bc4c60782390289adf1df5556cc2cf8cdef3b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc4c60782390289adf1df555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 09:59:13 2011 +0200 gdi32/tests: Fix some test failures on Windows. --- dlls/gdi32/tests/dc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index ab8a2d0..5017583 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -72,7 +72,7 @@ static void test_savedc_2(void) ok(hdc != NULL, "GetDC failed\n"); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "GetClipRgn returned %d instead of 0\n", ret); ret = GetRgnBox(hrgn, &rc); @@ -105,7 +105,7 @@ todo_wine ok(ret == SIMPLEREGION, "IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); SetRect(&rc, 0, 0, 50, 50); ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); @@ -113,7 +113,7 @@ todo_wine ok(ret, "ret = %d\n", ret); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); SetRect(&rc, 0, 0, 100, 100); ok(EqualRect(&rc, &rc_clip), "rects are not equal\n");

1 0

Henri Verbeet : wined3d: Don' t set GL_MAP_UNSYNCHRONIZED_BIT for WINED3D_BUFFER_DISCARD maps.
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: cf421e1b3f29c0df242f43bc235dab1f7410dd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf421e1b3f29c0df242f43bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 15 01:14:49 2011 +0200 wined3d: Don't set GL_MAP_UNSYNCHRONIZED_BIT for WINED3D_BUFFER_DISCARD maps. WINED3D_BUFFER_DISCARD means the (current) buffer contents are undefined for subsequent operations. I.e., the map doesn't have to wait for any pending operations to finish, and can just return a new buffer with undefined contents. GL_MAP_UNSYNCHRONIZED_BIT means the driver doesn't wait for previous operations to finish, and just maps a buffer that's potentially in use. Proper synchronization is left to the application. Note that we set both GL_MAP_INVALIDATE_BUFFER_BIT and GL_MAP_UNSYNCHRONIZED_BIT. GL_MAP_INVALIDATE_BUFFER_BIT corresponds to WINED3D_BUFFER_DISCARD, and might cause the driver to return a new buffer, but it's not required to make that optimization. --- dlls/wined3d/buffer.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12cbd7e..74864bb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -683,13 +683,9 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined GLbitfield mapflags; mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (flags & WINED3D_BUFFER_DISCARD) - { - mapflags |= GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT; - } - else if (flags & WINED3D_BUFFER_NOSYNC) - { + mapflags |= GL_MAP_INVALIDATE_BUFFER_BIT; + if (flags & WINED3D_BUFFER_NOSYNC) mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; - } map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); checkGLcall("glMapBufferRange"); @@ -976,17 +972,15 @@ static GLbitfield buffer_gl_map_flags(DWORD d3d_flags) { GLbitfield ret = 0; - if (!(d3d_flags & WINED3DLOCK_READONLY)) ret = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + if (!(d3d_flags & WINED3DLOCK_READONLY)) + ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + if (!(d3d_flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE))) + ret |= GL_MAP_READ_BIT; - if (d3d_flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) - { - if(d3d_flags & WINED3DLOCK_DISCARD) ret |= GL_MAP_INVALIDATE_BUFFER_BIT; + if (d3d_flags & WINED3DLOCK_DISCARD) + ret |= GL_MAP_INVALIDATE_BUFFER_BIT; + if (d3d_flags & WINED3DLOCK_NOOVERWRITE) ret |= GL_MAP_UNSYNCHRONIZED_BIT; - } - else - { - ret |= GL_MAP_READ_BIT; - } return ret; }

1 0

Jacek Caban : include: Added macros for __uuidof emulation based on C++ templates.
by Alexandre Julliard July 15, 2011

July 15, 2011

Module: wine Branch: master Commit: a8c75ad4c6637aa85834d0bff224586e3a7d4229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c75ad4c6637aa85834d0bff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 14 17:21:11 2011 +0200 include: Added macros for __uuidof emulation based on C++ templates. --- include/guiddef.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index f079983..ba8e8cf 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -29,6 +29,32 @@ typedef struct _GUID unsigned short Data3; unsigned char Data4[ 8 ]; } GUID; + +/* Macros for __uuidof emulation */ +#if defined(__cplusplus) && !defined(_MSC_VER) + +extern "C++" { + template<typename T> const GUID &__wine_uuidof(); +} + +#define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ + extern "C++" { \ + template<> inline const GUID &__wine_uuidof<type>() { \ + return (const IID){l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \ + } \ + template<> inline const GUID &__wine_uuidof<type*>() { \ + return __wine_uuidof<type>(); \ + } \ + } + +#define __uuidof(type) __wine_uuidof<typeof(type)>() + +#else + +#define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) + +#endif + #endif #undef DEFINE_GUID

1 0

Alexander Morozov : mshtml: Add stub implementation of IProvideClassInfo interface.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: c41a300f3c7eeb52a7362d7e194b8cc37a36e18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41a300f3c7eeb52a7362d7e1… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Jul 11 18:27:28 2011 +0400 mshtml: Add stub implementation of IProvideClassInfo interface. --- dlls/mshtml/htmldoc.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1ebb8eb..5ba48cd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1770,6 +1770,46 @@ static const IDispatchExVtbl DocDispatchExVtbl = { DocDispatchEx_GetNameSpaceParent }; +static inline HTMLDocument *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IProvideClassInfo_iface); +} + +static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideClassInfo *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IProvideClassInfo(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo_AddRef(IProvideClassInfo *iface) +{ + HTMLDocument *This = impl_from_IProvideClassInfo(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo *iface) +{ + HTMLDocument *This = impl_from_IProvideClassInfo(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface, + ITypeInfo **ppTI) +{ + HTMLDocument *This = impl_from_IProvideClassInfo(iface); + FIXME("(%p)->(%p)\n", This, ppTI); + *ppTI = NULL; + return E_NOTIMPL; +} + +static const IProvideClassInfoVtbl ProvideClassInfoVtbl = { + ProvideClassInfo_QueryInterface, + ProvideClassInfo_AddRef, + ProvideClassInfo_Release, + ProvideClassInfo_GetClassInfo +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -1897,6 +1937,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IObjectSafety, riid)) { TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); *ppv = &This->IObjectSafety_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { + TRACE("(%p)->(IID_IProvideClassInfo, %p)\n", This, ppv); + *ppv = &This->IProvideClassInfo_iface; }else { return FALSE; } @@ -1913,6 +1956,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl; doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; + doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl; doc->unk_impl = unk_impl; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c98f0af..71afb8f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -383,6 +383,7 @@ struct HTMLDocument { IObjectWithSite IObjectWithSite_iface; IOleContainer IOleContainer_iface; IObjectSafety IObjectSafety_iface; + IProvideClassInfo IProvideClassInfo_iface; IUnknown *unk_impl; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cd4dad9..21f183c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -128,6 +128,7 @@ static const IID * const doc_node_iids[] = { &IID_IInternetHostSecurityManager, &IID_IOleContainer, &IID_IObjectSafety, + &IID_IProvideClassInfo, NULL }; @@ -142,6 +143,7 @@ static const IID * const doc_obj_iids[] = { &IID_ICustomDoc, &IID_IOleContainer, &IID_IObjectSafety, + &IID_IProvideClassInfo, NULL };

1 0

Alistair Leslie-Hughes : xmllite: Implement CreateXmlWriter.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: b32ed46bdaea9298ac21beedb573931e36682542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32ed46bdaea9298ac21beedb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 23 05:05:01 2011 +1000 xmllite: Implement CreateXmlWriter. --- dlls/xmllite/Makefile.in | 1 + dlls/xmllite/tests/Makefile.in | 3 +- dlls/xmllite/tests/writer.c | 87 +++++++++ dlls/xmllite/writer.c | 413 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/xmllite.spec | 2 +- 5 files changed, 504 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b32ed46bdaea9298ac21b…

1 0

Francois Gouget : winmm: Make WINMM_DRVMessage() static.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 70730f9168456f65b77a3d45930d3dc74610f1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70730f9168456f65b77a3d459… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 14 13:14:30 2011 +0200 winmm: Make WINMM_DRVMessage() static. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 037ed11..48faf0f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2543,7 +2543,7 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, return MMSYSERR_NOERROR; } -UINT WINMM_DRVMessage(UINT dev, UINT message, DWORD_PTR param1, +static UINT WINMM_DRVMessage(UINT dev, UINT message, DWORD_PTR param1, DWORD_PTR param2, BOOL is_out) { WINE_MLD *wmld;

1 0