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

Alexandre Julliard : winebuild: Allow specifying arguments to stub functions for documentation purposes.
by Alexandre Julliard 03 May '11

03 May '11

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 03 May '11

03 May '11

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: Specify arguments for the stub functions.
by Alexandre Julliard 03 May '11

03 May '11

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 : msvcrt: Allow forwarding to stub functions when the arguments are known.
by Alexandre Julliard 03 May '11

03 May '11

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

André Hentschel : winedbg: Fix a typo.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 423a447fbe0df4b238a5d0ec9a07af8017673135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423a447fbe0df4b238a5d0ec9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 2 19:56:37 2011 +0200 winedbg: Fix a typo. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index a602c7e..904581d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -145,7 +145,7 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) (ctx->FloatSave.StatusWord & 0x00000200) >> 9, (ctx->FloatSave.StatusWord & 0x00000100) >> 8); - /* Now pull out hte 3 bit of the TOP stack pointer */ + /* Now pull out the 3 bit of the TOP stack pointer */ dbg_printf(" TOP:%01x", (unsigned int) (ctx->FloatSave.StatusWord & 0x00003800) >> 11); /* Lets analyse the error bits and indicate the status

1 0

Frédéric Delanoy : Fix image links in French help page
by Jeremy Newman 03 May '11

03 May '11

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 02 May '11

02 May '11

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

Nikolay Sivov : comctl32: Adjust field names and some defines to match current documentation.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: ed161054fa495b206da946d3ed57f67435119cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed161054fa495b206da946d3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 16:34:11 2011 +0400 comctl32: Adjust field names and some defines to match current documentation. --- dlls/comctl32/comctl32undoc.c | 82 ++++++++++++++++++++-------------------- dlls/comctl32/tests/mru.c | 40 ++++++++++---------- 2 files changed, 61 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed161054fa495b206da94…

1 0

Nikolay Sivov : comctl32/tests: Add more MRU tests.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: bf3f848d8a939949baf89fc873cc73a8f215c53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3f848d8a939949baf89fc87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 16:47:41 2011 +0400 comctl32/tests: Add more MRU tests. --- dlls/comctl32/tests/mru.c | 303 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 247 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf3f848d8a939949baf89…

1 0

Nikolay Sivov : comctl32: Ignore size field when creating with -W calls.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cefcadcc38fac636061bb70a64f367a97cb1b8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefcadcc38fac636061bb70a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 16:59:09 2011 +0400 comctl32: Ignore size field when creating with -W calls. --- dlls/comctl32/comctl32undoc.c | 24 +++++++++++------------- dlls/comctl32/tests/mru.c | 12 ++++++------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 8e22cf0..cc59747 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -649,9 +649,9 @@ INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) } /************************************************************************* - * CreateMRUListLazy_common (internal) + * create_mru_list (internal) */ -static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) +static HANDLE create_mru_list(LPWINEMRULIST mp) { UINT i, err; HKEY newkey; @@ -737,24 +737,22 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) * * See CreateMRUListLazyA. */ -HANDLE WINAPI CreateMRUListLazyW (const MRUINFOW *lpcml, DWORD dwParam2, +HANDLE WINAPI CreateMRUListLazyW (const MRUINFOW *infoW, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4) { LPWINEMRULIST mp; /* Native does not check for a NULL lpcml */ - - if (lpcml->cbSize != sizeof(MRUINFOW) || !lpcml->hKey || - IsBadStringPtrW(lpcml->lpszSubKey, -1)) + if (!infoW->hKey || IsBadStringPtrW(infoW->lpszSubKey, -1)) return NULL; mp = Alloc(sizeof(WINEMRULIST)); - memcpy(&mp->extview, lpcml, sizeof(MRUINFOW)); - mp->extview.lpszSubKey = Alloc((strlenW(lpcml->lpszSubKey) + 1) * sizeof(WCHAR)); - strcpyW(mp->extview.lpszSubKey, lpcml->lpszSubKey); + memcpy(&mp->extview, infoW, sizeof(MRUINFOW)); + mp->extview.lpszSubKey = Alloc((strlenW(infoW->lpszSubKey) + 1) * sizeof(WCHAR)); + strcpyW(mp->extview.lpszSubKey, infoW->lpszSubKey); mp->isUnicode = TRUE; - return CreateMRUListLazy_common(mp); + return create_mru_list(mp); } /************************************************************************** @@ -790,7 +788,7 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2, MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, mp->extview.lpszSubKey, len); mp->isUnicode = FALSE; - return CreateMRUListLazy_common(mp); + return create_mru_list(mp); } /************************************************************************** @@ -798,9 +796,9 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2, * * See CreateMRUListA. */ -HANDLE WINAPI CreateMRUListW (const MRUINFOW *lpcml) +HANDLE WINAPI CreateMRUListW (const MRUINFOW *infoW) { - return CreateMRUListLazyW(lpcml, 0, 0, 0); + return CreateMRUListLazyW(infoW, 0, 0, 0); } /************************************************************************** diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 70b355e..7d239d7 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -573,7 +573,7 @@ static void test_CreateMRUListW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListW(&infoW); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* increased size */ @@ -585,7 +585,7 @@ static void test_CreateMRUListW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListW(&infoW); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* zero size */ @@ -597,7 +597,7 @@ static void test_CreateMRUListW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListW(&infoW); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* NULL hKey */ @@ -655,7 +655,7 @@ static void test_CreateMRUListLazyW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListLazyW(&infoW, 0, 0, 0); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* increased size */ @@ -667,7 +667,7 @@ static void test_CreateMRUListLazyW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListLazyW(&infoW, 0, 0, 0); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* zero size */ @@ -679,7 +679,7 @@ static void test_CreateMRUListLazyW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListLazyW(&infoW, 0, 0, 0); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* NULL hKey */

1 0