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

Piotr Caban : msvcr: Add _ungetch_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 853d4343dba89b8df47d4f21f2170b52fcea1fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853d4343dba89b8df47d4f21f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:44 2015 +0200 msvcr: Add _ungetch_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 17 +++++++++++++---- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 002ed36..194554b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1410,7 +1410,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7b06c5f..9114632 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1768,7 +1768,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64eb2f5..9537d79 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1782,7 +1782,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0bef364..00f7ab2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1090,7 +1090,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fafed02..9384a3f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1065,7 +1065,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index ed8b728..0acaa03 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -280,19 +280,28 @@ char* CDECL _cgets(char* str) } /********************************************************************* - * _ungetch (MSVCRT.@) + * _ungetch_nolock (MSVCRT.@) */ -int CDECL _ungetch(int c) +int CDECL _ungetch_nolock(int c) { int retval = MSVCRT_EOF; - LOCK_CONSOLE; if (c != MSVCRT_EOF && __MSVCRT_console_buffer == MSVCRT_EOF) retval = __MSVCRT_console_buffer = c; - UNLOCK_CONSOLE; return retval; } /********************************************************************* + * _ungetch (MSVCRT.@) + */ +int CDECL _ungetch(int c) +{ + LOCK_CONSOLE; + c = _ungetch_nolock(c); + UNLOCK_CONSOLE; + return c; +} + +/********************************************************************* * _kbhit (MSVCRT.@) */ int CDECL _kbhit(void)

1 0

Mark Harmstone : winecfg: Invalidate property sheet when font changed.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3b9ac1b18a25ea80121cbf16e98a515f844fa6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9ac1b18a25ea80121cbf16e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Jun 11 18:17:26 2015 +0100 winecfg: Invalidate property sheet when font changed. When you changed the font on the Desktop Integration tab, it wasn't enabling the Apply button. --- programs/winecfg/theme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 8ffc9bb..8bc3c88 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1166,7 +1166,8 @@ static void on_select_font(HWND hDlg) cf.lpLogFont = &(metrics[index].lf); cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL | CF_NOVERTFONTS; - ChooseFontW(&cf); + if (ChooseFontW(&cf)) + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); } INT_PTR CALLBACK

1 0

Ken Thomases : winecoreaudio: Fix build by importing advapi32.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: f634faaae30546742d05a3587d41a11d18132ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f634faaae30546742d05a3587… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:03:43 2015 -0500 winecoreaudio: Fix build by importing advapi32. This was missed in commit 3494fb7f72e994c6f309e525ea3d01edf9efae1a. --- dlls/winecoreaudio.drv/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 532af48..25c6db2 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winecoreaudio.drv -IMPORTS = uuid ole32 user32 +IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS)

1 0

Ken Thomases : Revert "ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.".
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: e7fa76637858bffb2970606463008c8f6e62ce39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fa76637858bffb297060646… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:04:04 2015 -0500 Revert "ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.". This was wrong-headed and could never have worked. The second getattrlist() call that I was trying to avoid was only necessary when the first fails. Given that the first failed, its results can't be used to avoid the second, no matter what information we requested. This reverts commit 5514df9d4e4c14cafcc4284e12d26ad6c74709fe. --- dlls/ntdll/directory.c | 62 ++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cd9fdb0..8e4db83 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -983,35 +983,43 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /*********************************************************************** - * get_dir_case_sensitivity_attr_by_id + * get_dir_case_sensitivity_attr * - * Checks if the volume with the specified device and file system IDs - * is case sensitive or not. Uses getattrlist(2). + * Checks if the volume containing the specified directory is case + * sensitive or not. Uses getattrlist(2). */ -static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) +static int get_dir_case_sensitivity_attr( const char *dir ) { char *mntpoint = NULL; struct attrlist attr; struct vol_caps caps; + struct get_fsid get_fsid; struct fs_cache *entry; + /* First get the FS ID of the volume */ + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = 0; + attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; + attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; + get_fsid.size = 0; + if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || + get_fsid.size != sizeof(get_fsid)) + return -1; /* Try to look it up in the cache */ - entry = look_up_fs_cache( dev ); - if (entry && !memcmp( &entry->fsid, &fsid, sizeof(fsid_t) )) + entry = look_up_fs_cache( get_fsid.dev ); + if (entry && !memcmp( &entry->fsid, &get_fsid.fsid, sizeof(fsid_t) )) /* Cache lookup succeeded */ return entry->case_sensitive; /* Cache is stale at this point, we have to update it */ - mntpoint = get_device_mount_point( dev ); + mntpoint = get_device_mount_point( get_fsid.dev ); /* Now look up the case-sensitivity */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = attr.commonattr = 0; + attr.commonattr = 0; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; - attr.dirattr = attr.fileattr = attr.forkattr = 0; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); - add_fs_cache( dev, fsid, TRUE ); + add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); return TRUE; } RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); @@ -1028,34 +1036,11 @@ static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) else ret = TRUE; /* Update the cache */ - add_fs_cache( dev, fsid, ret ); + add_fs_cache( get_fsid.dev, get_fsid.fsid, ret ); return ret; } return FALSE; } - -/*********************************************************************** - * get_dir_case_sensitivity_attr - * - * Checks if the volume containing the specified directory is case - * sensitive or not. Uses getattrlist(2). - */ -static int get_dir_case_sensitivity_attr( const char *dir ) -{ - struct attrlist attr; - struct get_fsid get_fsid; - - /* First get the FS ID of the volume */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = 0; - attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; - attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; - get_fsid.size = 0; - if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || - get_fsid.size != sizeof(get_fsid)) - return -1; - return get_dir_case_sensitivity_attr_by_id( get_fsid.dev, get_fsid.fsid ); -} #endif /*********************************************************************** @@ -2163,8 +2148,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; - dev_t devid; - fsid_t fsid; fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; @@ -2196,7 +2179,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID | ATTR_CMN_OBJTYPE; + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ @@ -2216,8 +2199,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && - !get_dir_case_sensitivity_attr_by_id( attrlist_buffer.devid, attrlist_buffer.fsid )) + else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) { io->u.Status = STATUS_NO_MORE_FILES; ret = 0;

1 0

Ken Thomases : ntdll: Fix the "not found" status set by read_directory_stat() and read_directory_getattrlist() for when restart_scan is set.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3b74ac0f088f0eed37ef9280f8a1d558a1ec46e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b74ac0f088f0eed37ef9280f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:04:14 2015 -0500 ntdll: Fix the "not found" status set by read_directory_stat() and read_directory_getattrlist() for when restart_scan is set. --- dlls/ntdll/directory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8e4db83..0e02f2e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2103,7 +2103,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } - else io->u.Status = STATUS_NO_MORE_FILES; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) { @@ -2112,7 +2112,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG * read_directory_* function (we need to return the case-preserved * filename stored on the filesystem). */ ret = 0; - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else { @@ -2197,11 +2197,11 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } - else io->u.Status = STATUS_NO_MORE_FILES; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) { - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; ret = 0; } }

1 0

Michael Stefaniuc : dmcompos: Use the generic DirectMusicObject implementation for DMChordMap.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: c64d41fa470cfe9127aea2bb975971adf6d3335e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64d41fa470cfe9127aea2bb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 11 23:16:06 2015 +0200 dmcompos: Use the generic DirectMusicObject implementation for DMChordMap. --- dlls/dmcompos/Makefile.in | 1 + dlls/dmcompos/chordmap.c | 152 ++++++++------------------------- dlls/dmcompos/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++ dlls/dmcompos/dmobject.h | 55 ++++++++++++ dlls/dmcompos/tests/dmcompos.c | 6 +- 5 files changed, 278 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c64d41fa470cfe9127aea…

1 0

Michael Stefaniuc : dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 06e988a5d3b34f81e16576817ece8ae6a3636296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e988a5d3b34f81e16576817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 11 23:17:13 2015 +0200 dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmcompos/chordmap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 5ae8e8b..e3259e6 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -30,7 +30,6 @@ typedef struct IDirectMusicChordMapImpl { IDirectMusicChordMap IDirectMusicChordMap_iface; struct dmobject dmobj; LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapImpl; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ @@ -296,20 +295,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -331,8 +330,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -443,7 +442,6 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) (IUnknown *)&obj->IDirectMusicChordMap_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; DMCOMPOS_LockModule(); hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj);

1 0

Guillaume Charifi : xaudio2_7: Implement IXaudio2 interface as stub.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 2cc599d13a7c37f318de2dbb6eabce0d3830169c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc599d13a7c37f318de2dbb6… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Jun 9 13:53:00 2015 +0200 xaudio2_7: Implement IXaudio2 interface as stub. --- dlls/xaudio2_7/xaudio_dll.c | 312 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 295 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc599d13a7c37f318de2…

1 0

Guillaume Charifi : xaudio2_7: Add XAudio2 class registration.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: cd906f08cd5d75b2dba9e2f18166f6fb90848c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd906f08cd5d75b2dba9e2f18… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Jun 9 10:49:51 2015 +0200 xaudio2_7: Add XAudio2 class registration. --- configure | 2 +- configure.ac | 2 +- dlls/xaudio2_7/Makefile.in | 2 ++ dlls/xaudio2_7/xaudio_classes.idl | 28 ++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fa52cf7..e51ee56 100755 --- a/configure +++ b/configure @@ -17732,7 +17732,7 @@ wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 -wine_fn_config_dll xaudio2_7 enable_xaudio2_7 +wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index 79110c1..df28b27 100644 --- a/configure.ac +++ b/configure.ac @@ -3420,7 +3420,7 @@ WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) -WINE_CONFIG_DLL(xaudio2_7) +WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 853d1d6..6bdf362 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -3,3 +3,5 @@ IMPORTS = advapi32 kernel32 ole32 user32 uuid C_SRCS = \ xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl new file mode 100644 index 0000000..79bc7a4 --- /dev/null +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Guillaume Charifi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("XAudio2 Class"), + threading(both), + uuid(5a508685-a254-4fba-9b82-9a24b00306af) +] +coclass XAudio2 { interface IXAudio2; }

1 0

Matteo Bruni : d3d9/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 81935797a10908333113ba8315cb9bcc82fca114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81935797a10908333113ba831… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 10 22:30:26 2015 +0200 d3d9/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX. --- dlls/d3d9/tests/visual.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c4c1171..ae67d5c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -18772,6 +18772,181 @@ static void test_multisample_mismatch(void) DestroyWindow(window); } +static void test_texcoordindex(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + }}}; + static const struct + { + struct vec3 pos; + struct vec2 texcoord1; + struct vec2 texcoord2; + struct vec2 texcoord3; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}, {1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 0.0f}}, + }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + HWND window; + HRESULT hr; + IDirect3DTexture9 *texture1, *texture2; + D3DLOCKED_RECT locked_rect; + ULONG refcount; + D3DCOLOR color; + DWORD *ptr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture1, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture2, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture1, 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ptr = locked_rect.pBits; + ptr[0] = 0xff000000; + ptr[1] = 0xff00ff00; + ptr[2] = 0xff0000ff; + ptr[3] = 0xff00ffff; + hr = IDirect3DTexture9_UnlockRect(texture1, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture2, 0, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ptr = locked_rect.pBits; + ptr[0] = 0xff000000; + ptr[1] = 0xff0000ff; + ptr[2] = 0xffff0000; + ptr[3] = 0xffff00ff; + hr = IDirect3DTexture9_UnlockRect(texture2, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture1); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 1, (IDirect3DBaseTexture9 *)texture2); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX3); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_ADD); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXCOORDINDEX, 1); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXCOORDINDEX, 0); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff0000, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00ffffff, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2); + ok(SUCCEEDED(hr), "Failed to set texture transform flags, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE1, &mat); + ok(SUCCEEDED(hr), "Failed to set transformation matrix, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00000000, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); + ok(SUCCEEDED(hr), "Failed to set texture transform flags, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXCOORDINDEX, 2); + ok(SUCCEEDED(hr), "Failed to set texcoord index, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0000ffff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff00ff, 2), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00ffff00, 2), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DTexture9_Release(texture1); + IDirect3DTexture9_Release(texture2); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -18886,4 +19061,5 @@ START_TEST(visual) test_table_fog_zw(); test_signed_formats(); test_multisample_mismatch(); + test_texcoordindex(); }

1 0