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

Alexandre Julliard : msvcrt: Specify arguments for the stub functions.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: e51132b2389894346e13b5dd44c086876dde9610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51132b2389894346e13b5dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:09:55 2011 +0200 msvcrt: Specify arguments for the stub functions. --- dlls/msvcrt/msvcrt.spec | 756 +++++++++++++++++++++++----------------------- 1 files changed, 378 insertions(+), 378 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e51132b2389894346e13b…

1 0

Alexandre Julliard : winebuild: Allow specifying arguments to stub functions for documentation purposes.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 2e6f48b7304aae6769cd3d891c93dbe904ed5b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6f48b7304aae6769cd3d891… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 12:49:15 2011 +0200 winebuild: Allow specifying arguments to stub functions for documentation purposes. --- tools/winebuild/build.h | 2 +- tools/winebuild/parser.c | 68 ++++++++++++++++++++++++-------------- tools/winebuild/spec16.c | 4 +- tools/winebuild/spec32.c | 6 ++-- tools/winebuild/utils.c | 2 +- tools/winebuild/winebuild.man.in | 4 +- 6 files changed, 52 insertions(+), 34 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b64c9a0..05adf31 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -85,7 +85,7 @@ typedef struct typedef struct { - unsigned int nb_args; + int nb_args; enum arg_type args[MAX_ARGUMENTS]; } ORD_FUNCTION; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 755084e..705601e 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -237,33 +237,17 @@ static int parse_spec_variable( ORDDEF *odp, DLLSPEC *spec ) /******************************************************************* - * parse_spec_export + * parse_spec_arguments * - * Parse an exported function definition in a .spec file. + * Parse the arguments of an entry point. */ -static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) +static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) { const char *token; unsigned int i, arg; int is_win32 = (spec->type == SPEC_WIN32) || (odp->flags & FLAG_EXPORT32); - if (!is_win32 && odp->type == TYPE_STDCALL) - { - error( "'stdcall' not supported for Win16\n" ); - return 0; - } - if (!is_win32 && odp->type == TYPE_THISCALL) - { - error( "'thiscall' not supported for Win16\n" ); - return 0; - } - if (is_win32 && odp->type == TYPE_PASCAL) - { - error( "'pascal' not supported for Win32\n" ); - return 0; - } - - if (!(token = GetToken(0))) return 0; + if (!(token = GetToken( optional ))) return optional; if (*token != '(') { error( "Expected '(' got '%s'\n", token ); @@ -303,13 +287,45 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) } odp->u.func.nb_args = i; - if (odp->type == TYPE_VARARGS) - odp->flags |= FLAG_NORELAY; /* no relay debug possible for varags entry point */ if (odp->type == TYPE_THISCALL && (!i || odp->u.func.args[0] != ARG_PTR)) { error( "First argument of a thiscall function must be a pointer\n" ); return 0; } + return 1; +} + + +/******************************************************************* + * parse_spec_export + * + * Parse an exported function definition in a .spec file. + */ +static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) +{ + const char *token; + int is_win32 = (spec->type == SPEC_WIN32) || (odp->flags & FLAG_EXPORT32); + + if (!is_win32 && odp->type == TYPE_STDCALL) + { + error( "'stdcall' not supported for Win16\n" ); + return 0; + } + if (!is_win32 && odp->type == TYPE_THISCALL) + { + error( "'thiscall' not supported for Win16\n" ); + return 0; + } + if (is_win32 && odp->type == TYPE_PASCAL) + { + error( "'pascal' not supported for Win32\n" ); + return 0; + } + + if (!parse_spec_arguments( odp, spec, 0 )) return 0; + + if (odp->type == TYPE_VARARGS) + odp->flags |= FLAG_NORELAY; /* no relay debug possible for varags entry point */ if (!(token = GetToken(1))) { @@ -383,14 +399,15 @@ static int parse_spec_equate( ORDDEF *odp, DLLSPEC *spec ) */ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) { - odp->u.func.nb_args = 0; + odp->u.func.nb_args = -1; odp->link_name = xstrdup(""); /* don't bother generating stubs for Winelib */ if (odp->flags & FLAG_CPU_MASK) odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); else odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); - return 1; + + return parse_spec_arguments( odp, spec, 1 ); } @@ -808,7 +825,8 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) odp->ordinal = -1; odp->link_name = xstrdup( odp16->link_name ); odp->u.func.nb_args = odp16->u.func.nb_args; - memcpy( odp->u.func.args, odp16->u.func.args, odp->u.func.nb_args * sizeof(odp->u.func.args[0]) ); + if (odp->u.func.nb_args > 0) memcpy( odp->u.func.args, odp16->u.func.args, + odp->u.func.nb_args * sizeof(odp->u.func.args[0]) ); } assign_names( spec32 ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index c5ca051..481ed13 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -67,7 +67,7 @@ static inline int is_function( const ORDDEF *odp ) static const char *get_args_str( const ORDDEF *odp ) { static char buffer[MAX_ARGUMENTS*2+1]; - unsigned int i; + int i; buffer[0] = 0; for (i = 0; i < odp->u.func.nb_args; i++) @@ -275,7 +275,7 @@ static const char *get_relay_name( const ORDDEF *odp ) */ static int get_function_argsize( const ORDDEF *odp ) { - unsigned int i, argsize = 0; + int i, argsize = 0; for (i = 0; i < odp->u.func.nb_args; i++) { diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 6642661..8999b88 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -61,7 +61,7 @@ static inline int needs_relay( const ORDDEF *odp ) return 1; } -static int is_float_arg( const ORDDEF *odp, unsigned int arg ) +static int is_float_arg( const ORDDEF *odp, int arg ) { if (arg >= odp->u.func.nb_args) return 0; return (odp->u.func.args[arg] == ARG_FLOAT || odp->u.func.args[arg] == ARG_DOUBLE); @@ -89,8 +89,8 @@ int has_relays( DLLSPEC *spec ) */ static void output_relay_debug( DLLSPEC *spec ) { - int i; - unsigned int j, pos, args, flags; + int i, j; + unsigned int pos, args, flags; /* first the table of entry point offsets */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 931fc49..acd6915 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -892,7 +892,7 @@ unsigned int get_ptr_size(void) /* return the total size in bytes of the arguments on the stack */ unsigned int get_args_size( const ORDDEF *odp ) { - unsigned int i, size; + int i, size; for (i = size = 0; i < odp->u.func.nb_args; i++) { diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 479bb1f..59debd4 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -245,7 +245,7 @@ syntax is the following: .RI [ flags ]\ exportname \ [ symbolname ] .br .IB ordinal\ stub -.RI [ flags ]\ exportname +.RI [ flags ]\ exportname \ [\ \fB( args... \fB)\fR\ ] .br .IB ordinal\ equate .RI [ flags ]\ exportname\ data @@ -453,7 +453,7 @@ is not specified, it is assumed to be identical to Syntax: .br .IB ordinal\ stub -.RI [ flags ]\ exportname +.RI [ flags ]\ exportname \ [\ \fB( args... \fB)\fR\ ] .PP This declaration defines a stub function. It makes the name and ordinal available for dynamic linking, but will terminate execution

1 0

Alexandre Julliard : winebuild: Output relay thunks for stub functions when the arguments are known.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 631fb9b652dbb3fad5705d7ec08b123e8361db02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631fb9b652dbb3fad5705d7ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:09:09 2011 +0200 winebuild: Output relay thunks for stub functions when the arguments are known. --- tools/winebuild/spec32.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 8999b88..a5b4118 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -53,7 +53,18 @@ static inline int needs_relay( const ORDDEF *odp ) /* skip nonexistent entry points */ if (!odp) return 0; /* skip non-functions */ - if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL && odp->type != TYPE_THISCALL) return 0; + switch (odp->type) + { + case TYPE_STDCALL: + case TYPE_CDECL: + case TYPE_THISCALL: + break; + case TYPE_STUB: + if (odp->u.func.nb_args != -1) break; + /* fall through */ + default: + return 0; + } /* skip norelay and forward entry points */ if (odp->flags & (FLAG_NORELAY|FLAG_FORWARD)) return 0; /* skip register entry points on x86_64 */

1 0

Alexandre Julliard : msvcrt: Allow forwarding to stub functions when the arguments are known.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 6c88228078ab925d6a7d76ed2fc16ff4d9c10b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c88228078ab925d6a7d76ed2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:13:15 2011 +0200 msvcrt: Allow forwarding to stub functions when the arguments are known. --- dlls/crtdll/crtdll.spec | 16 ++++---- dlls/msvcr100/msvcr100.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr70/msvcr70.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr71/msvcr71.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr80/msvcr80.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcr90/msvcr90.spec | 94 +++++++++++++++++++++--------------------- dlls/msvcrt20/msvcrt20.spec | 78 ++++++++++++++++++------------------ dlls/msvcrt40/msvcrt40.spec | 90 ++++++++++++++++++++-------------------- dlls/msvcrtd/msvcrtd.spec | 94 +++++++++++++++++++++--------------------- tools/make_specfiles | 2 +- 10 files changed, 375 insertions(+), 375 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c88228078ab925d6a7d7…

1 0

Alexandre Julliard : msvcrt: Add a stub for msvcp70.dll.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 2f9c02e8f12d900b723cc7d89e417ec2a0973c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9c02e8f12d900b723cc7d89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 11:09:58 2011 +0200 msvcrt: Add a stub for msvcp70.dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp70/Makefile.in | 5 + dlls/msvcp70/msvcp70.c | 37 + dlls/msvcp70/msvcp70.spec | 5109 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 5153 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f9c02e8f12d900b723cc…

1 0

Frédéric Delanoy : Fix image links in French help page
by Jeremy Newman May 3, 2011

May 3, 2011

Module: website Branch: master Commit: 903b194714f9772c153c5cda6cf756aa9fb12c35 URL: http://source.winehq.org/git/website.git/?a=commit;h=903b194714f9772c153c5c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 3 11:36:48 2011 +0200 Fix image links in French help page --- templates/fr/help.template | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index 0e0fae9..99569eb 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -14,7 +14,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://www.codeweavers.com"><img src="${root}/images/paid.png"> Payant</a> + <a href="http://www.codeweavers.com"><img src="{$root}/images/paid.png"> Payant</a> </td> <td valign="top"> <a href="http://www.codeweavers.com">CodeWeavers</a> propose du support @@ -24,7 +24,7 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://wiki.winehq.org/FAQ"><img src="${root}/images/faq.png"> FAQ</a> + <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"> FAQ</a> </td> <td valign="top"> Des réponses rapides à la plupart des questions sont disponibles dans la @@ -35,10 +35,10 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="${root}/documentation"><img src="${root}/images/docs.png"> Docs</a> + <a href="{$root}/documentation"><img src="{$root}/images/docs.png"> Docs</a> </td> <td valign="top"> - Vous devriez lire notre <a href="${root}/site/documentation">documentation</a> + Vous devriez lire notre <a href="{$root}/site/documentation">documentation</a> en ligne pour trouver des réponses à vos questions. Notre <a href="http://wiki.winehq.org/HowTo">guide pratique</a> contient également diverses informations utiles pour le nouvel utilisateur. @@ -47,7 +47,7 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://wiki.winehq.org/"><img src="${root}/images/moinmoin.png"> Wiki</a> + <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"> Wiki</a> </td> <td valign="top"> Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. @@ -56,30 +56,30 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://forums.winehq.org/"><img src="${root}/images/forum.png"> Forum</a> + <a href="http://forums.winehq.org/"><img src="{$root}/images/forum.png"> Forum</a> </td> <td valign="top"> Il existe une communauté <a href="http://forums.winehq.org/">web</a>/<a -href="${root}/site/forums">e-mail</a> pour les utilisateurs de Wine, où ils +href="{$root}/site/forums">e-mail</a> pour les utilisateurs de Wine, où ils peuvent poser des questions et communiquer. -Vous pouvez également examiner les <a href="${root}/site/forums">listes de +Vous pouvez également examiner les <a href="{$root}/site/forums">listes de discussion</a> qui font également partie de la communauté. </td> </tr> <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="${root}/irc"><img src="${root}/images/irc.png"> IRC</a> + <a href="{$root}/irc"><img src="{$root}/images/irc.png"> IRC</a> </td> <td valign="top"> Vous pouvez discuter en direct avec la communauté Wine via notre <a -href="${root}/irc">canal IRC</a>. +href="{$root}/irc">canal IRC</a>. </td> </tr> <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://appdb.winehq.org/"><img src="${root}/images/appdb.png"> AppDB</a> + <a href="http://appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> </td> <td valign="top"> Si vous cherchez de l'aide pour une application particulière, notre <a @@ -90,7 +90,7 @@ intéressante. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://bugs.winehq.org/"><img src="${root}/images/bugs.png"> Bugzilla</a> + <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> </td> <td valign="top"> Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a>

1 0

Frédéric Delanoy : Add French help page
by Jeremy Newman May 2, 2011

May 2, 2011

Module: website Branch: master Commit: eb86981e852ca16f1cb67e0d74198d2f3b641fb1 URL: http://source.winehq.org/git/website.git/?a=commit;h=eb86981e852ca16f1cb67e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 2 21:25:01 2011 +0200 Add French help page --- templates/fr/help.template | 105 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template new file mode 100644 index 0000000..0e0fae9 --- /dev/null +++ b/templates/fr/help.template @@ -0,0 +1,105 @@ + + + +<h1 class="title">Obtenir de l'aide</h1> + +Il y a plusieurs façons d'obtenir de l'aide sur Wine. + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> + + <tr> + <td align="center" bgcolor="black" class="small">Alternative</td> + <td align="center" bgcolor="black" class="small">Informations complémentaires</td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.codeweavers.com"><img src="${root}/images/paid.png"> Payant</a> + </td> + <td valign="top"> + <a href="http://www.codeweavers.com">CodeWeavers</a> propose du support +payant pour Wine. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/FAQ"><img src="${root}/images/faq.png"> FAQ</a> + </td> + <td valign="top"> + Des réponses rapides à la plupart des questions sont disponibles dans la + <a href="http://wiki.winehq.org/FAQ">FAQ</a>. + C'est le premier endroit à visiter pour obtenir une réponse à vos questions. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="${root}/documentation"><img src="${root}/images/docs.png"> Docs</a> + </td> + <td valign="top"> + Vous devriez lire notre <a href="${root}/site/documentation">documentation</a> + en ligne pour trouver des réponses à vos questions. Notre + <a href="http://wiki.winehq.org/HowTo">guide pratique</a> contient également + diverses informations utiles pour le nouvel utilisateur. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/"><img src="${root}/images/moinmoin.png"> Wiki</a> + </td> + <td valign="top"> + Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. + </td> + </tr> + +<tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://forums.winehq.org/"><img src="${root}/images/forum.png"> Forum</a> + </td> + <td valign="top"> + Il existe une communauté <a href="http://forums.winehq.org/">web</a>/<a +href="${root}/site/forums">e-mail</a> pour les utilisateurs de Wine, où ils +peuvent poser des questions et communiquer. +Vous pouvez également examiner les <a href="${root}/site/forums">listes de +discussion</a> qui font également partie de la communauté. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="${root}/irc"><img src="${root}/images/irc.png"> IRC</a> + </td> + <td valign="top"> + Vous pouvez discuter en direct avec la communauté Wine via notre <a +href="${root}/irc">canal IRC</a>. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://appdb.winehq.org/"><img src="${root}/images/appdb.png"> AppDB</a> + </td> + <td valign="top"> + Si vous cherchez de l'aide pour une application particulière, notre <a +href="http://appdb.winehq.org/">base de données d'applications</a> peut être +intéressante. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://bugs.winehq.org/"><img src="${root}/images/bugs.png"> Bugzilla</a> + </td> + <td valign="top"> + Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a> +présente tous les problèmes sur lesquels nous avons travaillé ou travaillons actuellement. + </td> + </tr> +</table> + +Des problèmes avec notre site web ? Une faute de frappe ? Contactez +(en anglais) notre <a href="mailto:web-admin(a)winehq.org">équipe web</a> ! + +

1 0

Andrew Eikum : winecoreaudio.drv: Implement IAudioSessionControl::GetState.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 3025f7f505afbc16997307db791fd6ab9d541468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3025f7f505afbc16997307db7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 10:24:22 2011 -0500 winecoreaudio.drv: Implement IAudioSessionControl::GetState. --- dlls/winecoreaudio.drv/audio.c | 4 +- dlls/winecoreaudio.drv/mmdevdrv.c | 237 +++++++++++++++++++++++++++++++------ 2 files changed, 206 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3025f7f505afbc1699730…

1 0

Andrew Eikum : winealsa.drv: Implement IAudioSessionControl::GetState.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: eabf5715ce2616685e9ae6d86d96141ff405780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabf5715ce2616685e9ae6d86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:21:41 2011 -0500 winealsa.drv: Implement IAudioSessionControl::GetState. --- dlls/winealsa.drv/alsa.c | 16 ++- dlls/winealsa.drv/alsa.h | 8 -- dlls/winealsa.drv/dscapture.c | 3 + dlls/winealsa.drv/dsoutput.c | 3 + dlls/winealsa.drv/midi.c | 3 + dlls/winealsa.drv/mixer.c | 3 + dlls/winealsa.drv/mmdevdrv.c | 232 ++++++++++++++++++++++++++++++++++------- dlls/winealsa.drv/wavein.c | 5 + dlls/winealsa.drv/waveinit.c | 3 + dlls/winealsa.drv/waveout.c | 5 + 10 files changed, 231 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eabf5715ce2616685e9ae…

1 0

Andrew Eikum : mmdevapi/tests: Add tests for IAudioSessionControl::GetState .
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 4d2622e65b002ebed407186a00353a5649703b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2622e65b002ebed407186a0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:22:31 2011 -0500 mmdevapi/tests: Add tests for IAudioSessionControl::GetState. --- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 197 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 197 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 98c25a1..a0898b3 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "audiopolicy.h" #include "dshow.h" #include "dsound.h" #include "devpkey.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 7c8174b..659ce62 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -33,9 +33,25 @@ #include "uuids.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "audiopolicy.h" +#include <stdio.h> + +#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) + +static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; +static inline const char *dbgstr_guid( const GUID *id ) +{ + static char ret[256]; + sprintf(ret, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return ret; +} + static void test_uninitialized(IAudioClient *ac) { HRESULT hr; @@ -604,10 +620,188 @@ static void test_clock(void) IAudioClient_Release(ac); } +static void test_session(void) +{ + IAudioClient *ses1_ac1, *ses1_ac2, *cap_ac = NULL; + IAudioSessionControl2 *ses1_ctl, *ses1_ctl2, *cap_ctl; + IMMDevice *cap_dev; + GUID ses1_guid; + AudioSessionState state; + WAVEFORMATEX *pwfx; + ULONG ref; + HRESULT hr; + + hr = CoCreateGuid(&ses1_guid); + ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ses1_ac1); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ses1_ac1, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, pwfx, &ses1_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ses1_ac2); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, pwfx, &ses1_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, + eMultimedia, &cap_dev); + if(hr == S_OK){ + WAVEFORMATEX *cap_pwfx; + + hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&cap_ac); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, cap_pwfx, &ses1_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(cap_ac, &IID_IAudioSessionControl, (void**)&cap_ctl); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + IMMDevice_Release(cap_dev); + CoTaskMemFree(cap_pwfx); + }else + skip("No capture device available; skipping capture device in render session tests\n"); + + hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl2, (void**)&ses1_ctl); + ok(hr == E_NOINTERFACE, "GetService gave wrong error: %08x\n", hr); + + hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl2); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(ses1_ctl == ses1_ctl2, "Got different controls: %p %p\n", ses1_ctl, ses1_ctl2); + ref = IAudioSessionControl_Release(ses1_ctl2); + ok(ref != 0, "AudioSessionControl was destroyed\n"); + + hr = IAudioClient_GetService(ses1_ac2, &IID_IAudioSessionControl, (void**)&ses1_ctl2); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, NULL); + ok(hr == NULL_PTR_ERR, "GetState gave wrong error: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + if(cap_ac){ + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + } + + hr = IAudioClient_Start(ses1_ac1); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); + + if(cap_ac){ + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + } + + hr = IAudioClient_Stop(ses1_ac1); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + if(cap_ac){ + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioClient_Start(cap_ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); + + hr = IAudioClient_Stop(cap_ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + ref = IAudioSessionControl_Release(cap_ctl); + ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + + ref = IAudioClient_Release(cap_ac); + ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + } + + ref = IAudioSessionControl_Release(ses1_ctl); + ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + + ref = IAudioClient_Release(ses1_ac1); + ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + + ref = IAudioClient_Release(ses1_ac2); + ok(ref == 1, "AudioClient had wrong refcount: %u\n", ref); + + /* we've released all of our IAudioClient references, so check GetState */ + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + ref = IAudioSessionControl_Release(ses1_ctl2); + ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + + CoTaskMemFree(pwfx); +} + START_TEST(render) { HRESULT hr; - IMMDeviceEnumerator *mme = NULL; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -633,6 +827,7 @@ START_TEST(render) test_event(); test_padding(); test_clock(); + test_session(); IMMDevice_Release(dev);

1 0