wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Alexandre Julliard : makefiles: Add makedep pragmas for proxy idl files.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 074f30b9e358334c436d3faa468b7b5053f9403e URL: http://source.winehq.org/git/wine.git/?a=commit;h=074f30b9e358334c436d3faa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 16:08:15 2013 +0100 makefiles: Add makedep pragmas for proxy idl files. --- Make.rules.in | 2 +- dlls/actxprxy/actxprxy_activscp.idl | 2 ++ dlls/actxprxy/actxprxy_comcat.idl | 2 ++ dlls/actxprxy/actxprxy_docobj.idl | 2 ++ dlls/actxprxy/actxprxy_hlink.idl | 2 ++ dlls/actxprxy/actxprxy_htiface.idl | 2 ++ dlls/actxprxy/actxprxy_htiframe.idl | 2 ++ dlls/actxprxy/actxprxy_objsafe.idl | 2 ++ dlls/actxprxy/actxprxy_ocmm.idl | 2 ++ dlls/actxprxy/actxprxy_servprov.idl | 2 ++ dlls/actxprxy/actxprxy_shldisp.idl | 2 ++ dlls/actxprxy/actxprxy_shobjidl.idl | 2 ++ dlls/actxprxy/actxprxy_urlhist.idl | 2 ++ dlls/dispex/disp_ex.idl | 2 ++ dlls/msdaps/msdaps.idl | 2 ++ dlls/msdaps/row_server.idl | 2 ++ dlls/ole32/dcom.idl | 2 ++ dlls/ole32/ole32_objidl.idl | 2 ++ dlls/ole32/ole32_oleidl.idl | 2 ++ dlls/ole32/ole32_unknwn.idl | 2 ++ dlls/oleaut32/oleaut32_oaidl.idl | 2 ++ dlls/oleaut32/oleaut32_ocidl.idl | 2 ++ dlls/qmgrprxy/qmgrprxy.idl | 2 ++ dlls/quartz/quartz_strmif.idl | 2 ++ dlls/sti/sti_wia.idl | 2 ++ dlls/urlmon/urlmon_urlmon.idl | 2 ++ dlls/windowscodecs/windowscodecs_wincodec.idl | 2 ++ 27 files changed, 53 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 58bf0fa..62f6188 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -101,7 +101,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy diff --git a/dlls/actxprxy/actxprxy_activscp.idl b/dlls/actxprxy/actxprxy_activscp.idl index 3f0fda7..935033e 100644 --- a/dlls/actxprxy/actxprxy_activscp.idl +++ b/dlls/actxprxy/actxprxy_activscp.idl @@ -18,6 +18,8 @@ /* just a wrapper for activscp.idl */ +#pragma makedep proxy + #include "activscp.idl" [ diff --git a/dlls/actxprxy/actxprxy_comcat.idl b/dlls/actxprxy/actxprxy_comcat.idl index 548aa0d..1240ccc 100644 --- a/dlls/actxprxy/actxprxy_comcat.idl +++ b/dlls/actxprxy/actxprxy_comcat.idl @@ -18,6 +18,8 @@ /* just a wrapper for comcat.idl */ +#pragma makedep proxy + #include "comcat.idl" [ diff --git a/dlls/actxprxy/actxprxy_docobj.idl b/dlls/actxprxy/actxprxy_docobj.idl index 8b2a83f..6e16e83 100644 --- a/dlls/actxprxy/actxprxy_docobj.idl +++ b/dlls/actxprxy/actxprxy_docobj.idl @@ -18,6 +18,8 @@ /* just a wrapper for docobj.idl */ +#pragma makedep proxy + #include "docobj.idl" [ diff --git a/dlls/actxprxy/actxprxy_hlink.idl b/dlls/actxprxy/actxprxy_hlink.idl index 479e937..12251d3 100644 --- a/dlls/actxprxy/actxprxy_hlink.idl +++ b/dlls/actxprxy/actxprxy_hlink.idl @@ -18,6 +18,8 @@ /* just a wrapper for hlink.idl */ +#pragma makedep proxy + #include "hlink.idl" [ diff --git a/dlls/actxprxy/actxprxy_htiface.idl b/dlls/actxprxy/actxprxy_htiface.idl index 8ecf7e6..b1d4639 100644 --- a/dlls/actxprxy/actxprxy_htiface.idl +++ b/dlls/actxprxy/actxprxy_htiface.idl @@ -18,6 +18,8 @@ /* just a wrapper for htiface.idl */ +#pragma makedep proxy + #include "htiface.idl" [ diff --git a/dlls/actxprxy/actxprxy_htiframe.idl b/dlls/actxprxy/actxprxy_htiframe.idl index e3d5f72..531f4e4 100644 --- a/dlls/actxprxy/actxprxy_htiframe.idl +++ b/dlls/actxprxy/actxprxy_htiframe.idl @@ -18,6 +18,8 @@ /* just a wrapper for htiframe.idl */ +#pragma makedep proxy + #include "htiframe.idl" [ diff --git a/dlls/actxprxy/actxprxy_objsafe.idl b/dlls/actxprxy/actxprxy_objsafe.idl index 771a4d9..379bf6d 100644 --- a/dlls/actxprxy/actxprxy_objsafe.idl +++ b/dlls/actxprxy/actxprxy_objsafe.idl @@ -18,6 +18,8 @@ /* just a wrapper for objsafe.idl */ +#pragma makedep proxy + #include "objsafe.idl" [ diff --git a/dlls/actxprxy/actxprxy_ocmm.idl b/dlls/actxprxy/actxprxy_ocmm.idl index 75e4788..a13e95a 100644 --- a/dlls/actxprxy/actxprxy_ocmm.idl +++ b/dlls/actxprxy/actxprxy_ocmm.idl @@ -18,6 +18,8 @@ /* just a wrapper for ocmm.idl */ +#pragma makedep proxy + #include "ocmm.idl" [ diff --git a/dlls/actxprxy/actxprxy_servprov.idl b/dlls/actxprxy/actxprxy_servprov.idl index 1388f23..a2a75d0 100644 --- a/dlls/actxprxy/actxprxy_servprov.idl +++ b/dlls/actxprxy/actxprxy_servprov.idl @@ -1,3 +1,5 @@ +#pragma makedep proxy + #include "servprov.idl" [ diff --git a/dlls/actxprxy/actxprxy_shldisp.idl b/dlls/actxprxy/actxprxy_shldisp.idl index e5ddb18..8925295 100644 --- a/dlls/actxprxy/actxprxy_shldisp.idl +++ b/dlls/actxprxy/actxprxy_shldisp.idl @@ -18,6 +18,8 @@ /* just a wrapper for shldisp.idl */ +#pragma makedep proxy + #include "shldisp.idl" [ diff --git a/dlls/actxprxy/actxprxy_shobjidl.idl b/dlls/actxprxy/actxprxy_shobjidl.idl index ccff236..76bfe3e 100644 --- a/dlls/actxprxy/actxprxy_shobjidl.idl +++ b/dlls/actxprxy/actxprxy_shobjidl.idl @@ -18,6 +18,8 @@ /* just a wrapper for shobjidl.idl */ +#pragma makedep proxy + #include "shobjidl.idl" [ diff --git a/dlls/actxprxy/actxprxy_urlhist.idl b/dlls/actxprxy/actxprxy_urlhist.idl index f987752..1d4aa03 100644 --- a/dlls/actxprxy/actxprxy_urlhist.idl +++ b/dlls/actxprxy/actxprxy_urlhist.idl @@ -18,6 +18,8 @@ /* just a wrapper for urlhist.idl */ +#pragma makedep proxy + #include "urlhist.idl" [ diff --git a/dlls/dispex/disp_ex.idl b/dlls/dispex/disp_ex.idl index 4008a7a..eed36cc 100644 --- a/dlls/dispex/disp_ex.idl +++ b/dlls/dispex/disp_ex.idl @@ -1,3 +1,5 @@ +#pragma makedep proxy + #include "dispex.idl" [ diff --git a/dlls/msdaps/msdaps.idl b/dlls/msdaps/msdaps.idl index dbbe75c..0144104 100644 --- a/dlls/msdaps/msdaps.idl +++ b/dlls/msdaps/msdaps.idl @@ -1,3 +1,5 @@ +#pragma makedep proxy + #include "oledb.idl" [ diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index a59e6d8..e110f6e 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + import "oledb.idl"; diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index 4517b46..492bce2 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -19,6 +19,8 @@ /* see the official DCOM specification * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */ +#pragma makedep proxy + import "unknwn.idl"; [ diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index 057a3e3..801c856 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -20,6 +20,8 @@ including objidl.h at some point. This will cause all sorts of errors so the easiest thing to do is just comment out our entire header. */ +#pragma makedep proxy + cpp_quote("#if 0 /* ole32_objidl.idl hack */") #include "objidl.idl" cpp_quote("#endif /* ole32_objidl.idl hack */") diff --git a/dlls/ole32/ole32_oleidl.idl b/dlls/ole32/ole32_oleidl.idl index a3bd881..ef13456 100644 --- a/dlls/ole32/ole32_oleidl.idl +++ b/dlls/ole32/ole32_oleidl.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + #include "oleidl.idl" [ diff --git a/dlls/ole32/ole32_unknwn.idl b/dlls/ole32/ole32_unknwn.idl index 9be195f..ee12a75 100644 --- a/dlls/ole32/ole32_unknwn.idl +++ b/dlls/ole32/ole32_unknwn.idl @@ -20,6 +20,8 @@ including unknwn.h at some point. This will cause all sorts of errors so the easiest thing to do is just comment out our entire header. */ +#pragma makedep proxy + cpp_quote("#if 0 /* oleaut32_unknwn.idl hack */") #include "unknwn.idl" cpp_quote("#endif /* oleaut32_unknwn.idl hack */") diff --git a/dlls/oleaut32/oleaut32_oaidl.idl b/dlls/oleaut32/oleaut32_oaidl.idl index 3574d08..8c1547f 100644 --- a/dlls/oleaut32/oleaut32_oaidl.idl +++ b/dlls/oleaut32/oleaut32_oaidl.idl @@ -20,6 +20,8 @@ including oaidl.h at some point. This will cause all sorts of errors so the easiest thing to do is just comment out our entire header. */ +#pragma makedep proxy + cpp_quote("#if 0 /* oleaut32_oaidl.idl hack */") #include "oaidl.idl" cpp_quote("#endif /* oleaut32_oaidl.idl hack */") diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index fad3741..68e1679 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + #include "ocidl.idl" [ diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl index 369301a..a775512 100644 --- a/dlls/qmgrprxy/qmgrprxy.idl +++ b/dlls/qmgrprxy/qmgrprxy.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + #include "bits.idl" #define DO_NO_IMPORTS diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl index ed7abe6..0bbe664 100644 --- a/dlls/quartz/quartz_strmif.idl +++ b/dlls/quartz/quartz_strmif.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + cpp_quote("#include <wingdi.h>") #include "strmif.idl" diff --git a/dlls/sti/sti_wia.idl b/dlls/sti/sti_wia.idl index f7744a1..7ce34a2 100644 --- a/dlls/sti/sti_wia.idl +++ b/dlls/sti/sti_wia.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + #include "wia_lh.idl" [ diff --git a/dlls/urlmon/urlmon_urlmon.idl b/dlls/urlmon/urlmon_urlmon.idl index 0ba5ce6..49c5e09 100644 --- a/dlls/urlmon/urlmon_urlmon.idl +++ b/dlls/urlmon/urlmon_urlmon.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + #include "urlmon.idl" [ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 658ced0..c46e4ec 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy + #include "wincodec.idl" [

1 0

Alexandre Julliard : makefiles: Add makedep pragmas for client and server idl files.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: c3a48aab209affb40cee41ceeb52391ce4de8d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a48aab209affb40cee41cee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 12:51:07 2013 +0100 makefiles: Add makedep pragmas for client and server idl files. --- Make.rules.in | 2 +- dlls/advapi32/svcctl.idl | 2 ++ dlls/ole32/irot.idl | 2 ++ dlls/rpcrt4/epm.idl | 2 ++ dlls/rpcrt4/tests/server.idl | 3 +++ programs/rpcss/epm.idl | 2 ++ programs/rpcss/irot.idl | 2 ++ programs/services/svcctl.idl | 2 ++ 8 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 2c0f965..58bf0fa 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -101,7 +101,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy diff --git a/dlls/advapi32/svcctl.idl b/dlls/advapi32/svcctl.idl index 101e0f2..b1bc854 100644 --- a/dlls/advapi32/svcctl.idl +++ b/dlls/advapi32/svcctl.idl @@ -1 +1,3 @@ +#pragma makedep client + #include "wine/svcctl.idl" diff --git a/dlls/ole32/irot.idl b/dlls/ole32/irot.idl index 95236db..ca730fd 100644 --- a/dlls/ole32/irot.idl +++ b/dlls/ole32/irot.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep client + #include "wine/irot.idl" diff --git a/dlls/rpcrt4/epm.idl b/dlls/rpcrt4/epm.idl index 67fad34..5295186 100644 --- a/dlls/rpcrt4/epm.idl +++ b/dlls/rpcrt4/epm.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep client + #include "wine/epm.idl" diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 2e305c1..c193bae 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep client +#pragma makedep server + #include "server_defines.h" typedef struct tag_vector diff --git a/programs/rpcss/epm.idl b/programs/rpcss/epm.idl index 67fad34..09eff62 100644 --- a/programs/rpcss/epm.idl +++ b/programs/rpcss/epm.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/epm.idl" diff --git a/programs/rpcss/irot.idl b/programs/rpcss/irot.idl index 95236db..b6ea6e7 100644 --- a/programs/rpcss/irot.idl +++ b/programs/rpcss/irot.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/irot.idl" diff --git a/programs/services/svcctl.idl b/programs/services/svcctl.idl index 101e0f2..6d25e72 100644 --- a/programs/services/svcctl.idl +++ b/programs/services/svcctl.idl @@ -1 +1,3 @@ +#pragma makedep server + #include "wine/svcctl.idl"

1 0

Alexandre Julliard : makedep: Add support for #pragma directives in the source to set the flags for generated files .
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: ae9f33e17b428d2b554236d093a96c90a24fa112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9f33e17b428d2b554236d09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 12:48:16 2013 +0100 makedep: Add support for #pragma directives in the source to set the flags for generated files. --- tools/makedep.c | 151 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 95 insertions(+), 56 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 561cf0b..4c54c90 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -615,6 +615,80 @@ found: /******************************************************************* + * parse_include_directive + */ +static void parse_include_directive( struct incl_file *source, char *str ) +{ + char quote, *include, *p = str; + + while (*p && isspace(*p)) p++; + if (*p != '\"' && *p != '<' ) return; + quote = *p++; + if (quote == '<') quote = '>'; + include = p; + while (*p && (*p != quote)) p++; + if (!*p) fatal_error( "malformed include directive '%s'\n", str ); + *p = 0; + add_include( source, include, (quote == '>') ); +} + + +/******************************************************************* + * parse_pragma_directive + */ +static void parse_pragma_directive( struct incl_file *source, char *str ) +{ + char *flag, *p = str; + + if (!isspace( *p )) return; + while (*p && isspace(*p)) p++; + p = strtok( p, " \t" ); + if (strcmp( p, "makedep" )) return; + + while ((flag = strtok( NULL, " \t" ))) + { + if (!strcmp( flag, "depend" )) + { + while ((p = strtok( NULL, " \t" ))) add_include( source, p, 0 ); + return; + } + if (strendswith( source->name, ".idl" )) + { + if (!strcmp( flag, "header" )) source->flags |= FLAG_IDL_HEADER; + else if (!strcmp( flag, "proxy" )) source->flags |= FLAG_IDL_PROXY; + else if (!strcmp( flag, "client" )) source->flags |= FLAG_IDL_CLIENT; + else if (!strcmp( flag, "server" )) source->flags |= FLAG_IDL_SERVER; + else if (!strcmp( flag, "ident" )) source->flags |= FLAG_IDL_IDENT; + else if (!strcmp( flag, "typelib" )) source->flags |= FLAG_IDL_TYPELIB; + else if (!strcmp( flag, "register" )) source->flags |= FLAG_IDL_REGISTER; + } + else if (strendswith( source->name, ".rc" )) + { + if (!strcmp( flag, "po" )) source->flags |= FLAG_RC_PO; + } + } +} + + +/******************************************************************* + * parse_cpp_directive + */ +static void parse_cpp_directive( struct incl_file *source, char *str ) +{ + while (*str && isspace(*str)) str++; + if (*str++ != '#') return; + while (*str && isspace(*str)) str++; + + if (!strncmp( str, "include", 7 )) + parse_include_directive( source, str + 7 ); + else if (!strncmp( str, "import", 6 ) && strendswith( source->name, ".m" )) + parse_include_directive( source, str + 6 ); + else if (!strncmp( str, "pragma", 6 )) + parse_pragma_directive( source, str + 6 ); +} + + +/******************************************************************* * parse_idl_file * * If for_h_file is non-zero, it means we are not interested in the idl file @@ -685,20 +759,7 @@ static void parse_idl_file( struct incl_file *pFile, FILE *file, int for_h_file continue; } - /* check for normal #include */ - if (*p++ != '#') continue; - while (*p && isspace(*p)) p++; - if (strncmp( p, "include", 7 )) continue; - p += 7; - while (*p && isspace(*p)) p++; - if (*p != '\"' && *p != '<' ) continue; - quote = *p++; - if (quote == '<') quote = '>'; - include = p; - while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "malformed #include directive\n" ); - *p = 0; - add_include( pFile, include, (quote == '>') ); + parse_cpp_directive( pFile, p ); } } @@ -707,28 +768,12 @@ static void parse_idl_file( struct incl_file *pFile, FILE *file, int for_h_file */ static void parse_c_file( struct incl_file *pFile, FILE *file ) { - char *buffer, *include; + char *buffer; input_line = 0; while ((buffer = get_line( file ))) { - char quote; - char *p = buffer; - while (*p && isspace(*p)) p++; - if (*p++ != '#') continue; - while (*p && isspace(*p)) p++; - if (!strncmp( p, "include", 7 )) p += 7; - else if (!strncmp( p, "import", 6 )) p += 6; - else continue; - while (*p && isspace(*p)) p++; - if (*p != '\"' && *p != '<' ) continue; - quote = *p++; - if (quote == '<') quote = '>'; - include = p; - while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "malformed #include directive\n" ); - *p = 0; - add_include( pFile, include, (quote == '>') ); + parse_cpp_directive( pFile, buffer ); } } @@ -768,23 +813,11 @@ static void parse_rc_file( struct incl_file *pFile, FILE *file ) if (!*p) fatal_error( "malformed makedep comment\n" ); *p = 0; + add_include( pFile, include, (quote == '>') ); + continue; } - else /* check for #include */ - { - if (*p++ != '#') continue; - while (*p && isspace(*p)) p++; - if (strncmp( p, "include", 7 )) continue; - p += 7; - while (*p && isspace(*p)) p++; - if (*p != '\"' && *p != '<' ) continue; - quote = *p++; - if (quote == '<') quote = '>'; - include = p; - while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "malformed #include directive\n" ); - *p = 0; - } - add_include( pFile, include, (quote == '>') ); + + parse_cpp_directive( pFile, buffer ); } } @@ -917,14 +950,7 @@ static struct incl_file *add_src_file( const char *name ) } if (strendswith( file->name, ".tlb" ) || - strendswith( file->name, "_r.res" ) || - strendswith( file->name, "_t.res" )) - { - file->filename = xstrdup( file->name ); - return file; - } - - if (strendswith( file->name, ".res" ) || + strendswith( file->name, ".res" ) || strendswith( file->name, ".pot" ) || strendswith( file->name, ".x" )) { @@ -942,10 +968,23 @@ static struct incl_file *add_src_file( const char *name ) */ static void add_generated_sources(void) { + unsigned int i; struct incl_file *source, *next; LIST_FOR_EACH_ENTRY_SAFE( source, next, &sources, struct incl_file, entry ) { + if (!source->flags) continue; + for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++) + { + if (!(source->flags & idl_outputs[i].flag)) continue; + if (!strendswith( idl_outputs[i].ext, ".c" )) continue; + add_src_file( replace_extension( source->name, 4, idl_outputs[i].ext )); + } + if (source->flags & FLAG_IDL_PROXY) add_src_file( "dlldata.o" ); + } + + LIST_FOR_EACH_ENTRY_SAFE( source, next, &sources, struct incl_file, entry ) + { if (strendswith( source->name, "_c.c" ) || strendswith( source->name, "_i.c" ) || strendswith( source->name, "_p.c" ) ||

1 0

Francois Gouget : po: Avoid a couple of abbreviations in the French translation.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 76e3068c0a67b5bd6d35415be4716410640dccbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e3068c0a67b5bd6d35415be… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 5 17:52:22 2013 +0100 po: Avoid a couple of abbreviations in the French translation. --- po/fr.po | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7f851ba..abf5a0e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9436,11 +9436,12 @@ msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <rép> est la version courte de CHDIR. Elle change le répertoire courant.\n" +"CD <répertoire> est la version courte de CHDIR. Elle change le répertoire\n" +"courant.\n" #: cmd.rc:41 msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <rép> change le répertoire courant.\n" +msgstr "CHDIR <répertoire> change le répertoire courant.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9703,11 +9704,12 @@ msgstr "RENAME <fichier> renomme un fichier.\n" #: cmd.rc:158 msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <rép> est la version courte de RMDIR. Elle efface un répertoire.\n" +msgstr "" +"RD <répertoire> est la version courte de RMDIR. Elle efface un répertoire.\n" #: cmd.rc:159 msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <rép> efface un sous-répertoire.\n" +msgstr "RMDIR <répertoire> efface un répertoire.\n" #: cmd.rc:203 msgid "" @@ -9895,7 +9897,7 @@ msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <rép> enregistre le répertoire courant sur une pile et \n" +"PUSHD <répertoire> enregistre le répertoire courant sur une pile et\n" "remplace le répertoire courant par le répertoire spécifié.\n" #: cmd.rc:247

1 0

Francois Gouget : po: A small Esperanto spelling fix.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 1a74eab53a59e6cc77b05c3313499991f8781471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74eab53a59e6cc77b05c331… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 5 17:45:34 2013 +0100 po: A small Esperanto spelling fix. --- po/eo.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/eo.po b/po/eo.po index 9187059..e23b5fa 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7862,7 +7862,7 @@ msgstr "Bildoj" #: shell32.rc:220 msgid "Videos" -msgstr "Video" +msgstr "Videoj" #: shell32.rc:213 msgid "Program Files (x86)"

1 0

Frédéric Delanoy : regsvr32: Use BOOL type where appropriate.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 5fd54997ba6ba5ecc97918731a7b2baed04b32e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd54997ba6ba5ecc97918731… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 5 01:06:04 2013 +0100 regsvr32: Use BOOL type where appropriate. --- programs/regsvr32/regsvr32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ac8760b..3536e93 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -60,7 +60,7 @@ typedef HRESULT (*DLLREGISTER) (void); typedef HRESULT (*DLLUNREGISTER) (void); typedef HRESULT (*DLLINSTALL) (BOOL,LPCWSTR); -int Silent = 0; +static BOOL Silent = FALSE; static int Usage(void) { @@ -206,7 +206,7 @@ int main(int argc, char* argv[]) if ((!strcasecmp(argv[i], "/u")) ||(!strcasecmp(argv[i], "-u"))) Unregister = TRUE; else if ((!strcasecmp(argv[i], "/s"))||(!strcasecmp(argv[i], "-s"))) - Silent = 1; + Silent = TRUE; else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) { CHAR* command_line = argv[i] + strlen("/i");

1 0

Frédéric Delanoy : user32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: bb2be1732751d53837fd151024a3839f034f8ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2be1732751d53837fd15102… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 5 01:05:01 2013 +0100 user32/tests: Use BOOL type where appropriate. --- dlls/user32/tests/combo.c | 2 +- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/dce.c | 7 ++- dlls/user32/tests/dialog.c | 2 +- dlls/user32/tests/edit.c | 8 ++-- dlls/user32/tests/input.c | 108 ++++++++++++++++++++-------------------- 6 files changed, 65 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb2be1732751d53837fd1…

1 0

Frédéric Delanoy : user32: Use BOOL type where appropriate.
by Alexandre Julliard 05 Nov '13

05 Nov '13

Module: wine Branch: master Commit: 77ee42fd330130c55b6b74ab8662a23774551ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ee42fd330130c55b6b74ab8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 5 01:05:02 2013 +0100 user32: Use BOOL type where appropriate. --- dlls/user32/mdi.c | 22 +++++++++++----------- dlls/user32/menu.c | 4 ++-- dlls/user32/message.c | 4 ++-- dlls/user32/misc.c | 2 +- dlls/user32/win.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 7b50fae..8ef7214 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -844,13 +844,13 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) TRACE("frame %p,child %p\n",frame,hChild); - if( !menu ) return 0; + if (!menu) return FALSE; /* create a copy of sysmenu popup and insert it into frame menu bar */ if (!(hSysPopup = GetSystemMenu(hChild, FALSE))) { TRACE("child %p doesn't have a system menu\n", hChild); - return 0; + return FALSE; } AppendMenuW(menu, MF_HELP | MF_BITMAP, @@ -898,7 +898,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) { TRACE("not inserted\n"); DestroyMenu(hSysPopup); - return 0; + return FALSE; } EnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED); @@ -909,7 +909,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) /* redraw menu */ DrawMenuBar(frame); - return 1; + return TRUE; } /********************************************************************** @@ -924,13 +924,13 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) TRACE("frame %p, child %p\n", frame, hChild); - if( !menu ) return 0; + if (!menu) return FALSE; /* if there is no system buttons then nothing to do */ nItems = GetMenuItemCount(menu) - 1; iId = GetMenuItemID(menu, nItems); if ( !(iId == SC_RESTORE || iId == SC_CLOSE) ) - return 0; + return FALSE; /* * Remove the system menu, If that menu is the icon of the window @@ -963,7 +963,7 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) DrawMenuBar(frame); - return 1; + return TRUE; } @@ -1665,7 +1665,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) MDICLIENTINFO *ci = get_client_info( hwndClient ); WPARAM wParam = 0; - if (!ci || !IsWindowEnabled(ci->hwndActiveChild)) return 0; + if (!ci || !IsWindowEnabled(ci->hwndActiveChild)) return FALSE; /* translate if the Ctrl key is down and Alt not. */ @@ -1686,14 +1686,14 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) } /* fall through */ default: - return 0; + return FALSE; } TRACE("wParam = %04lx\n", wParam); SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, msg->wParam); - return 1; + return TRUE; } } - return 0; /* failure */ + return FALSE; /* failure */ } /*********************************************************************** diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 73b20b9..50545ee 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1172,7 +1172,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) MENUITEM *lpitem; HDC hdc; UINT start, i; - int textandbmp = FALSE; + BOOL textandbmp = FALSE; int orgX, orgY, maxX, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; @@ -1591,7 +1591,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, HBITMAP bm; INT y = rect.top + rect.bottom; RECT rc = rect; - int checked = FALSE; + BOOL checked = FALSE; UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK ); UINT check_bitmap_height = GetSystemMetrics( SM_CYMENUCHECK ); /* Draw the check mark diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4fc87ad..b51b6de 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -422,14 +422,14 @@ static const unsigned int message_unicode_flags[] = }; /* check whether a given message type includes pointers */ -static inline int is_pointer_message( UINT message ) +static inline BOOL is_pointer_message( UINT message ) { if (message >= 8*sizeof(message_pointer_flags)) return FALSE; return (message_pointer_flags[message / 32] & SET(message)) != 0; } /* check whether a given message type contains Unicode (or ASCII) chars */ -static inline int is_unicode_message( UINT message ) +static inline BOOL is_unicode_message( UINT message ) { if (message >= 8*sizeof(message_unicode_flags)) return FALSE; return (message_unicode_flags[message / 32] & SET(message)) != 0; diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index ad3c788..732d11c 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -458,7 +458,7 @@ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) { FIXME("(%p): stub\n", hWnd); - return 0; + return FALSE; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7223b41..275b93c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3478,7 +3478,7 @@ BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id ) if (wnd == WND_OTHER_PROCESS) { if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return 0; + return FALSE; } wnd->helpContext = id; WIN_ReleasePtr( wnd ); @@ -3511,7 +3511,7 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) if( msg.message == WM_LBUTTONUP ) { ReleaseCapture(); - return 0; + return FALSE; } if( msg.message == WM_MOUSEMOVE ) { @@ -3521,13 +3521,13 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) if( !PtInRect( &rect, tmp )) { ReleaseCapture(); - return 1; + return TRUE; } } } WaitMessage(); } - return 0; + return FALSE; } /******************************************************************************

1 0

Andrew Eikum : msacm32: Don't clear DONE flag in Un,PrepareHeader.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 3cb2ddfd09d5986614e028aa413e71e7624d2470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb2ddfd09d5986614e028aa4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 4 10:06:02 2013 -0600 msacm32: Don't clear DONE flag in Un,PrepareHeader. --- dlls/msacm32/stream.c | 7 +--- dlls/msacm32/tests/msacm.c | 87 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 7 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 0b336dd..bdfc3cc 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -311,9 +311,6 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if (fdwPrepare) ret = MMSYSERR_INVALFLAG; - if (pash->fdwStatus & ACMSTREAMHEADER_STATUSF_DONE) - return MMSYSERR_NOERROR; - /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed * in ACMSTREAMHEADER in the dwReservedDriver array @@ -334,7 +331,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_PREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE); + padsh->fdwStatus &= ~ACMSTREAMHEADER_STATUSF_INQUEUE; padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_PREPARED; padsh->fdwPrepared = padsh->fdwStatus; padsh->dwPrepared = 0; @@ -477,7 +474,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_UNPREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); + padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); } TRACE("=> (%d)\n", ret); return ret; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 95ab578..c36bdbf 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -454,7 +454,7 @@ static void check_count(UINT uMetric) trace("%s: %u\n", get_metric(uMetric), dwMetric); } -static void msacm_tests(void) +static void driver_tests(void) { MMRESULT rc; DWORD dwACMVersion = acmGetVersion(); @@ -488,7 +488,90 @@ static void msacm_tests(void) rc, MMSYSERR_NOERROR); } +static void test_prepareheader(void) +{ + HACMSTREAM has; + ADPCMWAVEFORMAT *src; + WAVEFORMATEX dst; + MMRESULT mr; + ACMSTREAMHEADER hdr; + BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[512], input[512]; + ADPCMCOEFSET *coef; + + src = (ADPCMWAVEFORMAT*)buf; + coef = src->aCoef; + src->wfx.cbSize = 32; + src->wfx.wFormatTag = WAVE_FORMAT_ADPCM; + src->wfx.nSamplesPerSec = 22050; + src->wfx.wBitsPerSample = 4; + src->wfx.nChannels = 1; + src->wfx.nBlockAlign = 512; + src->wfx.nAvgBytesPerSec = 11025; + src->wSamplesPerBlock = 0x3f4; + src->wNumCoef = 7; + coef[0].iCoef1 = 0x0100; + coef[0].iCoef2 = 0x0000; + coef[1].iCoef1 = 0x0200; + coef[1].iCoef2 = 0xff00; + coef[2].iCoef1 = 0x0000; + coef[2].iCoef2 = 0x0000; + coef[3].iCoef1 = 0x00c0; + coef[3].iCoef2 = 0x0040; + coef[4].iCoef1 = 0x00f0; + coef[4].iCoef2 = 0x0000; + coef[5].iCoef1 = 0x01cc; + coef[5].iCoef2 = 0xff30; + coef[6].iCoef1 = 0x0188; + coef[6].iCoef2 = 0xff18; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 22050; + dst.wBitsPerSample = 8; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR, "open failed: 0x%x\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = sizeof(pcm); + hdr.fdwStatus = ACMSTREAMHEADER_STATUSF_DONE; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); +} + START_TEST(msacm) { - msacm_tests(); + driver_tests(); + test_prepareheader(); }

1 0

Andrew Eikum : msadp32: Also convert to 8-bit PCM.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 39185814b1e51348d50458632f44e0756fba8426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39185814b1e51348d50458632… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 4 10:05:58 2013 -0600 msadp32: Also convert to 8-bit PCM. --- dlls/msadp32.acm/msadp32.c | 96 +++++++++++++++++++++++++++++--------------- 1 files changed, 64 insertions(+), 32 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index d76a2f8..59f71b5 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -223,6 +223,11 @@ static inline void process_nibble(unsigned nibble, int* idelta, if (*idelta < 16) *idelta = 16; } +static inline unsigned char C168(short s) +{ + return HIBYTE(s) ^ (unsigned char)0x80; +} + static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) @@ -234,10 +239,10 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2 * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2 * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -256,18 +261,34 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, sample2L = R16(src); src += 2; sample2R = R16(src); src += 2; - /* store samples from block head */ - W16(dst, sample2L); dst += 2; - W16(dst, sample2R); dst += 2; - W16(dst, sample1L); dst += 2; - W16(dst, sample1R); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp--) - { - process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); - W16(dst, sample1L); dst += 2; - process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); - W16(dst, sample1R); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + /* store samples from block head */ + *dst = C168(sample2L); ++dst; + *dst = C168(sample2R); ++dst; + *dst = C168(sample1L); ++dst; + *dst = C168(sample1R); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + *dst = C168(sample1L); ++dst; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + *dst = C168(sample1R); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + /* store samples from block head */ + W16(dst, sample2L); dst += 2; + W16(dst, sample2R); dst += 2; + W16(dst, sample1L); dst += 2; + W16(dst, sample1R); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + W16(dst, sample1L); dst += 2; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + W16(dst, sample1R); dst += 2; + } } src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -283,10 +304,10 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -301,16 +322,30 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, sample2 = R16(src); src += 2; /* store samples from block head */ - W16(dst, sample2); dst += 2; - W16(dst, sample1); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) - { - process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; - process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + *dst = C168(sample2); ++dst; + *dst = C168(sample1); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + W16(dst, sample2); dst += 2; + W16(dst, sample1); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + } } + src = in_src + adsi->pwfxSrc->nBlockAlign; } } @@ -553,12 +588,9 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available - * ADPCM algo only define 16 bit per sample output - */ + /* resampling or mono <=> stereo not available */ if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels) goto theEnd; #if 0 @@ -577,9 +609,9 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) #endif /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + if (adsi->pwfxDst->nChannels == 2) aad->convert = cvtSSms16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + else if (adsi->pwfxDst->nChannels == 1) aad->convert = cvtMMms16K; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013