June 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : wined3d: Avoid sizeof on structs with variable length arrays.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: db5053c95042f7b202ab2f07f4f5902df133d3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5053c95042f7b202ab2f07f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 13 10:41:30 2012 +0200 wined3d: Avoid sizeof on structs with variable length arrays. --- dlls/wined3d/wined3d_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 08d1554..526c749 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -96,7 +96,7 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) struct wined3d *object; HRESULT hr; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct wined3d, adapters[1])); if (!object) { ERR("Failed to allocate wined3d object memory.\n");

1 0

Jacek Caban : d3d9.h: Added missing D3DCREATE_* flags.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: d44ff3647526783efc6681bb31fd68562b676530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44ff3647526783efc6681bb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 11:47:40 2012 +0200 d3d9.h: Added missing D3DCREATE_* flags. --- include/d3d9.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index e7636e5..0f52d09 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -43,6 +43,12 @@ #define D3DCREATE_MIXED_VERTEXPROCESSING __MSABI_LONG(0x00000080) #define D3DCREATE_DISABLE_DRIVER_MANAGEMENT __MSABI_LONG(0x00000100) #define D3DCREATE_ADAPTERGROUP_DEVICE __MSABI_LONG(0x00000200) +#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX __MSABI_LONG(0x00000400) +#define D3DCREATE_NOWINDOWCHANGES __MSABI_LONG(0x00000800) +#define D3DCREATE_DISABLE_PSGP_THREADING __MSABI_LONG(0x00002000) +#define D3DCREATE_ENABLE_PRESENTSTATS __MSABI_LONG(0x00004000) +#define D3DCREATE_DISABLE_PRINTSCREEN __MSABI_LONG(0x00008000) +#define D3DCREATE_SCREENSAVER __MSABI_LONG(0x10000000) /***************************************************************************** * Flags for SetPrivateData

1 0

Jacek Caban : d3d9types.h: Added missing D3DSWAPEFFECT_* values.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 71ac2d90df681aa4006cda18b08b97c98ba511b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ac2d90df681aa4006cda18b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 11:47:50 2012 +0200 d3d9types.h: Added missing D3DSWAPEFFECT_* values. --- include/d3d9types.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 8855383..cdd3ada 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -1064,6 +1064,8 @@ typedef enum _D3DSWAPEFFECT { D3DSWAPEFFECT_DISCARD = 1, D3DSWAPEFFECT_FLIP = 2, D3DSWAPEFFECT_COPY = 3, + D3DSWAPEFFECT_OVERLAY = 4, + D3DSWAPEFFECT_FLIPEX = 5, D3DSWAPEFFECT_FORCE_DWORD = 0xFFFFFFFF } D3DSWAPEFFECT;

1 0

Jacek Caban : d3dcompiler.h: Added missing extern "C".
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: ee82123bd47d9a437f2507adaa40a5e9ae872404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee82123bd47d9a437f2507ada… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 11:48:04 2012 +0200 d3dcompiler.h: Added missing extern "C". --- include/d3dcompiler.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 43af264..3950143 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -21,6 +21,10 @@ #include "d3d11shader.h" +#ifdef __cplusplus +extern "C" { +#endif + #define D3DCOMPILE_DEBUG 0x0001 #define D3DCOMPILE_SKIP_VALIDATION 0x0002 #define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004 @@ -85,4 +89,8 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +#ifdef __cplusplus +} +#endif + #endif

1 0

André Hentschel : ntdll: Enhance FreeBSD checks for cdrom code to also check for DragonFly BSD when appropriate .
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: a8139f0ba182b0b995febc1d5fde9cd9b9e5616e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8139f0ba182b0b995febc1d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 12 19:27:36 2012 +0200 ntdll: Enhance FreeBSD checks for cdrom code to also check for DragonFly BSD when appropriate. --- dlls/ntdll/cdrom.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 1d1aa63..1188772 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -480,7 +480,7 @@ static NTSTATUS CDROM_SyncCache(int dev, int fd) cdrom_cache[dev].toc_good = 1; return STATUS_SUCCESS; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) int i, tsz; struct ioc_toc_header hdr; @@ -791,7 +791,7 @@ static NTSTATUS CDROM_ResetAudio(int fd) { #if defined(linux) return CDROM_GetStatusCode(ioctl(fd, CDROMRESET)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) return CDROM_GetStatusCode(ioctl(fd, CDIOCRESET, NULL)); #else FIXME("not supported on this O/S\n"); @@ -808,7 +808,7 @@ static NTSTATUS CDROM_SetTray(int fd, BOOL doEject) { #if defined(linux) return CDROM_GetStatusCode(ioctl(fd, doEject ? CDROMEJECT : CDROMCLOSETRAY)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) return CDROM_GetStatusCode((ioctl(fd, CDIOCALLOW, NULL)) || (ioctl(fd, doEject ? CDIOCEJECT : CDIOCCLOSE, NULL)) || (ioctl(fd, CDIOCPREVENT, NULL))); @@ -830,7 +830,7 @@ static NTSTATUS CDROM_ControlEjection(int fd, const PREVENT_MEDIA_REMOVAL* rmv) { #if defined(linux) return CDROM_GetStatusCode(ioctl(fd, CDROM_LOCKDOOR, rmv->PreventMediaRemoval)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) return CDROM_GetStatusCode(ioctl(fd, (rmv->PreventMediaRemoval) ? CDIOCPREVENT : CDIOCALLOW, NULL)); #else FIXME("not supported on this O/S\n"); @@ -985,7 +985,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA end: ret = CDROM_GetStatusCode(io); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct ioc_read_subchannel read_sc; @@ -1141,7 +1141,7 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) int ret; ret = ioctl(fd, CDIOCSTART, NULL); if(ret == 0) @@ -1194,7 +1194,7 @@ static NTSTATUS CDROM_PlayAudioMSF(int fd, const CDROM_PLAY_AUDIO_MSF* audio_msf msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1); end: ret = CDROM_GetStatusCode(io); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) struct ioc_play_msf msf; int io; @@ -1239,7 +1239,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int dev, int fd, const CDROM_SEEK_AUDIO_MSF* #if defined(linux) struct cdrom_msf0 msf; struct cdrom_subchnl sc; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) struct ioc_play_msf msf; struct ioc_read_subchannel read_sc; struct cd_sub_channel_info sc; @@ -1292,7 +1292,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int dev, int fd, const CDROM_SEEK_AUDIO_MSF* return CDROM_GetStatusCode(ioctl(fd, CDROMSEEK, &msf)); } return STATUS_SUCCESS; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) read_sc.address_format = CD_MSF_FORMAT; read_sc.track = 0; read_sc.data_len = sizeof(sc); @@ -1333,7 +1333,7 @@ static NTSTATUS CDROM_PauseAudio(int fd) { #if defined(linux) return CDROM_GetStatusCode(ioctl(fd, CDROMPAUSE)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) return CDROM_GetStatusCode(ioctl(fd, CDIOCPAUSE, NULL)); #else FIXME(": not supported on this O/S\n"); @@ -1350,7 +1350,7 @@ static NTSTATUS CDROM_ResumeAudio(int fd) { #if defined(linux) return CDROM_GetStatusCode(ioctl(fd, CDROMRESUME)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) return CDROM_GetStatusCode(ioctl(fd, CDIOCRESUME, NULL)); #else FIXME("not supported on this O/S\n"); @@ -1367,7 +1367,7 @@ static NTSTATUS CDROM_StopAudio(int fd) { #if defined(linux) return CDROM_GetStatusCode(ioctl(fd, CDROMSTOP)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) return CDROM_GetStatusCode(ioctl(fd, CDIOCSTOP, NULL)); #else FIXME("not supported on this O/S\n"); @@ -1395,7 +1395,7 @@ static NTSTATUS CDROM_GetVolume(int fd, VOLUME_CONTROL* vc) vc->PortVolume[3] = volc.channel3; } return CDROM_GetStatusCode(io); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) struct ioc_vol volc; int io; @@ -1430,7 +1430,7 @@ static NTSTATUS CDROM_SetVolume(int fd, const VOLUME_CONTROL* vc) volc.channel3 = vc->PortVolume[3]; return CDROM_GetStatusCode(ioctl(fd, CDROMVOLCTRL, &volc)); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) struct ioc_vol volc; volc.vol[0] = vc->PortVolume[0];

1 0

Nozomi Kodama : d3dx9_36: D3DXQuaternionLn computes as if the norm of the input is 1.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 4099eb8bbb4b769ec6de0640d13b777c238304ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4099eb8bbb4b769ec6de0640d… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Tue Jun 12 08:13:39 2012 +0800 d3dx9_36: D3DXQuaternionLn computes as if the norm of the input is 1. --- dlls/d3dx9_36/math.c | 33 ++++++++++++--------------------- dlls/d3dx9_36/tests/math.c | 19 ++++++++++++++++--- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 10a6cb9..5c6530a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1215,29 +1215,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUA D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) { - FLOAT norm, normvec, theta; + FLOAT t; - norm = D3DXQuaternionLengthSq(pq); - if ( norm > 1.0001f ) - { - pout->x = pq->x; - pout->y = pq->y; - pout->z = pq->z; - pout->w = 0.0f; - } - else if( norm > 0.99999f) - { - normvec = sqrt( pq->x * pq->x + pq->y * pq->y + pq->z * pq->z ); - theta = atan2(normvec, pq->w) / normvec; - pout->x = theta * pq->x; - pout->y = theta * pq->y; - pout->z = theta * pq->z; - pout->w = 0.0f; - } + TRACE("(%p, %p)\n", pout, pq); + + if ( (pq->w >= 1.0f) || (pq->w == -1.0f) ) + t = 1.0f; else - { - FIXME("The quaternion (%f, %f, %f, %f) has a norm <1. This should not happen. Windows returns a result anyway. This case is not implemented yet.\n", pq->x, pq->y, pq->z, pq->w); - } + t = acos( pq->w ) / sqrt( 1.0f - pq->w * pq->w ); + + pout->x = t * pq->x; + pout->y = t * pq->y; + pout->z = t * pq->z; + pout->w = 0.0f; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 61f8567..c93044d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -746,11 +746,24 @@ static void D3DXQuaternionTest(void) expectedquat.x = 0.093768f; expectedquat.y = 0.187536f; expectedquat.z = 0.375073f; expectedquat.w = 0.0f; D3DXQuaternionLn(&gotquat,&Nq); expect_vec4(expectedquat,gotquat); - /* Test the cas where the norm of the quaternion is <1 */ - Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w= 0.9f; + Nq.x = 0.0f; Nq.y = 0.0f; Nq.z = 0.0f; Nq.w = 1.0f; + expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&Nq); + expect_vec4(expectedquat,gotquat); + Nq.x = 5.4f; Nq.y = 1.2f; Nq.z = -0.3f; Nq.w = -0.3f; + expectedquat.x = 10.616652f; expectedquat.y = 2.359256f; expectedquat.z = -0.589814f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&Nq); + expect_vec4(expectedquat,gotquat); + /* Test the case where the norm of the quaternion is <1 */ + Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w = 0.9f; expectedquat.x = 0.206945f; expectedquat.y = 0.103473f; expectedquat.z = 0.310418f; expectedquat.w = 0.0f; D3DXQuaternionLn(&gotquat,&Nq1); - todo_wine{ expect_vec4(expectedquat,gotquat) }; + expect_vec4(expectedquat,gotquat); + /* Test the case where the real part of the quaternion is -1.0f */ + Nq1.x = 0.2f; Nq1.y = 0.1f; Nq1.z = 0.3; Nq1.w = -1.0f; + expectedquat.x = 0.2f; expectedquat.y = 0.1f; expectedquat.z = 0.3f; expectedquat.w = 0.0f; + D3DXQuaternionLn(&gotquat,&Nq1); + expect_vec4(expectedquat,gotquat); /*_______________D3DXQuaternionMultiply________________________*/ expectedquat.x = 3.0f; expectedquat.y = 61.0f; expectedquat.z = -32.0f; expectedquat.w = 85.0f;

1 0

Alexandre Julliard : mountmgr: Add a helper function for parsing UDisks media compatibility.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 2f86012373b1247235165f8ff16cafda97a97d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f86012373b1247235165f8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 13 17:36:55 2012 +0200 mountmgr: Add a helper function for parsing UDisks media compatibility. --- dlls/mountmgr.sys/dbus.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 608efd0..3571bf4 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -140,6 +140,11 @@ static LONG WINAPI assert_fault(EXCEPTION_POINTERS *eptr) return EXCEPTION_CONTINUE_SEARCH; } +static inline int starts_with( const char *str, const char *prefix ) +{ + return !strncmp( str, prefix, strlen(prefix) ); +} + static GUID *parse_uuid( GUID *guid, const char *str ) { /* standard uuid format */ @@ -199,6 +204,27 @@ static const char *udisks_next_dict_entry( DBusMessageIter *iter, DBusMessageIte return name; } +static enum device_type udisks_parse_media_compatibility( DBusMessageIter *iter ) +{ + DBusMessageIter media; + enum device_type drive_type = DEVICE_UNKNOWN; + + p_dbus_message_iter_recurse( iter, &media ); + while (p_dbus_message_iter_get_arg_type( &media ) == DBUS_TYPE_STRING) + { + const char *media_type; + p_dbus_message_iter_get_basic( &media, &media_type ); + if (starts_with( media_type, "optical_dvd" )) + drive_type = DEVICE_DVD; + if (starts_with( media_type, "floppy" )) + drive_type = DEVICE_FLOPPY; + else if (starts_with( media_type, "optical_" ) && drive_type == DEVICE_UNKNOWN) + drive_type = DEVICE_CDROM; + p_dbus_message_iter_next( &media ); + } + return drive_type; +} + /* UDisks callback for new device */ static void udisks_new_device( const char *udi ) { @@ -246,22 +272,7 @@ static void udisks_new_device( const char *udi ) else if (!strcmp( name, "IdType" )) p_dbus_message_iter_get_basic( &variant, &type ); else if (!strcmp( name, "DriveMediaCompatibility" )) - { - DBusMessageIter media; - p_dbus_message_iter_recurse( &variant, &media ); - while (p_dbus_message_iter_get_arg_type( &media ) == DBUS_TYPE_STRING) - { - const char *media_type; - p_dbus_message_iter_get_basic( &media, &media_type ); - if (!strncmp( media_type, "optical_dvd", 11 )) - drive_type = DEVICE_DVD; - if (!strncmp( media_type, "floppy", 6 )) - drive_type = DEVICE_FLOPPY; - else if (!strncmp( media_type, "optical_", 8 ) && drive_type == DEVICE_UNKNOWN) - drive_type = DEVICE_CDROM; - p_dbus_message_iter_next( &media ); - } - } + drive_type = udisks_parse_media_compatibility( &variant ); else if (!strcmp( name, "DeviceMountPaths" )) { DBusMessageIter paths;

1 0

Alexandre Julliard : mountmgr: Add support for UDisks2.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 2ffc57821fc2b1d5094ed2e0746c9718cdbab077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffc57821fc2b1d5094ed2e07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 13 17:51:00 2012 +0200 mountmgr: Add support for UDisks2. --- dlls/mountmgr.sys/dbus.c | 215 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 203 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ffc57821fc2b1d5094ed…

1 0

Ulrik Dickow : msxml3/tests: Test namespace change for all document versions.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: fc8ab63563663f5076d86fa814289d2e046e5125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8ab63563663f5076d86fa81… Author: Ulrik Dickow <u.dickow(a)gmail.com> Date: Wed Jun 13 16:19:02 2012 +0200 msxml3/tests: Test namespace change for all document versions. --- dlls/msxml3/tests/domdoc.c | 159 +++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 77 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d4ff6a2..0c9d65a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7160,7 +7160,86 @@ static void test_testTransforms(void) free_bstrs(); } -static void test_namespaces(void) +struct namespaces_change_t { + const CLSID *clsid; + const char *name; +}; + +static const struct namespaces_change_t namespaces_change_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument" }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2" }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26" }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30" }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40" }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60" }, + { 0 } +}; + +static void test_namespaces_change(void) +{ + const struct namespaces_change_t *class_ptr = namespaces_change_test_data; + + while (class_ptr->clsid) + { + IXMLDOMDocument *doc = NULL; + IXMLDOMElement *elem = NULL; + IXMLDOMNode *node = NULL; + + VARIANT var; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&doc); + if (hr != S_OK) + { + win_skip("failed to create class instance for %s\n", class_ptr->name); + class_ptr++; + continue; + } + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + /* try same prefix, different uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + /* try same prefix and uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s for %s\n", + wine_dbgstr_w(str), class_ptr->name); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + + free_bstrs(); + + class_ptr++; + } +} + +static void test_namespaces_basic(void) { static const CHAR namespaces_xmlA[] = "<?xml version=\"1.0\"?>\n" @@ -7175,7 +7254,6 @@ static void test_namespaces(void) IXMLDOMNode *node; VARIANT_BOOL b; - VARIANT var; HRESULT hr; BSTR str; @@ -7252,80 +7330,6 @@ static void test_namespaces(void) IXMLDOMDocument_Release(doc); - /* create on element and try to alter namespace after that */ - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; - - V_VT(&var) = VT_I2; - V_I2(&var) = NODE_ELEMENT; - - hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_appendChild(doc, node, NULL); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri2"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, E_INVALIDARG); - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMElement_get_xml(elem, &str); - EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IXMLDOMElement_Release(elem); - IXMLDOMDocument_Release(doc); - - /* create on element and try to alter namespace after that */ - doc = create_document_version(60, &IID_IXMLDOMDocument); - if (!doc) return; - - V_VT(&var) = VT_I2; - V_I2(&var) = NODE_ELEMENT; - - hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_appendChild(doc, node, NULL); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); - - /* try same prefix, different uri */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri2"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, E_INVALIDARG); - - /* try same prefix and uri */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMElement_get_xml(elem, &str); - EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IXMLDOMElement_Release(elem); - IXMLDOMDocument_Release(doc); - free_bstrs(); } @@ -11851,7 +11855,8 @@ START_TEST(domdoc) test_xmlTypes(); test_save(); test_testTransforms(); - test_namespaces(); + test_namespaces_basic(); + test_namespaces_change(); test_FormattingXML(); test_nodeTypedValue(); test_TransformWithLoadingLocalFile();

1 0

Jacek Caban : mshtml: Release script hosts in window_set_docnode.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: e120ca06c36a6ed6dc3303099fca030fa7a87b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e120ca06c36a6ed6dc3303099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:11:36 2012 +0200 mshtml: Release script hosts in window_set_docnode. --- dlls/mshtml/htmlwindow.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 43c65d9..ff17f95 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -49,6 +49,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) window->doc->basedoc.cp_container.forward_container = NULL; detach_events(window->doc); abort_document_bindings(window->doc); + release_script_hosts(window); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); }

1 0