wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Matteo Bruni : wpp: Let pp_add_define take the responsibility of copying strings (Valgrind).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 46caa0d225918d4ae5cf4feca9b1829fcd1fd0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=46caa0d225918d4ae5cf4feca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 15:15:13 2011 +0100 wpp: Let pp_add_define take the responsibility of copying strings (Valgrind). --- libs/wpp/ppy.y | 2 +- libs/wpp/preproc.c | 37 ++++++++++++++++++++++--------------- libs/wpp/wpp.c | 10 +++++----- libs/wpp/wpp_private.h | 2 +- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index b50e120..a66072d 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -275,7 +275,7 @@ preprocessor } } | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } - | tDEFINE opt_text tNL { pp_add_define($1, $2); } + | tDEFINE opt_text tNL { pp_add_define($1, $2); free($1); free($2); } | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { pp_add_macro($1, macro_args, nmacro_args, $5); } diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index c88bff5..99934d6 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -319,7 +319,7 @@ void pp_del_define(const char *name) printf("Deleted (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); } -pp_entry_t *pp_add_define(char *def, char *text) +pp_entry_t *pp_add_define(const char *def, const char *text) { int len; char *cptr; @@ -339,38 +339,45 @@ pp_entry_t *pp_add_define(char *def, char *text) if(!ppp) return NULL; memset( ppp, 0, sizeof(*ppp) ); - ppp->ident = def; + ppp->ident = pp_xstrdup(def); + if(!ppp->ident) + goto error; ppp->type = def_define; - ppp->subst.text = text; + ppp->subst.text = text ? pp_xstrdup(text) : NULL; + if(text && !ppp->subst.text) + goto error; ppp->filename = pp_xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); if(!ppp->filename) - { - free(ppp); - return NULL; - } + goto error; ppp->linenumber = pp_status.input ? pp_status.line_number : 0; ppp->next = pp_def_state->defines[idx]; pp_def_state->defines[idx] = ppp; if(ppp->next) ppp->next->prev = ppp; - if(text) + if(ppp->subst.text) { /* Strip trailing white space from subst text */ - len = strlen(text); - while(len && strchr(" \t\r\n", text[len-1])) + len = strlen(ppp->subst.text); + while(len && strchr(" \t\r\n", ppp->subst.text[len-1])) { - text[--len] = '\0'; + ppp->subst.text[--len] = '\0'; } /* Strip leading white space from subst text */ - for(cptr = text; *cptr && strchr(" \t\r", *cptr); cptr++) + for(cptr = ppp->subst.text; *cptr && strchr(" \t\r", *cptr); cptr++) ; - if(text != cptr) - memmove(text, cptr, strlen(cptr)+1); + if(ppp->subst.text != cptr) + memmove(ppp->subst.text, cptr, strlen(cptr)+1); } if(pp_status.debug) - printf("Added define (%s, %d) <%s> to <%s>\n", pp_status.input, pp_status.line_number, ppp->ident, text ? text : "(null)"); + printf("Added define (%s, %d) <%s> to <%s>\n", pp_status.input, pp_status.line_number, ppp->ident, ppp->subst.text ? ppp->subst.text : "(null)"); return ppp; + +error: + free(ppp->ident); + free(ppp->subst.text); + free(ppp); + return NULL; } pp_entry_t *pp_add_macro(char *id, marg_t *args[], int nargs, mtext_t *exp) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 41ac54f..0c9c808 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -45,7 +45,7 @@ static void add_cmdline_defines(void) for (def = cmdline_defines; def; def = def->next) { - if (def->value) pp_add_define( pp_xstrdup(def->name), pp_xstrdup(def->value) ); + if (def->value) pp_add_define( def->name, def->value ); } } @@ -56,16 +56,16 @@ static void add_special_defines(void) char buf[32]; strftime(buf, sizeof(buf), "\"%b %d %Y\"", localtime(&now)); - pp_add_define( pp_xstrdup("__DATE__"), pp_xstrdup(buf) ); + pp_add_define( "__DATE__", buf ); strftime(buf, sizeof(buf), "\"%H:%M:%S\"", localtime(&now)); - pp_add_define( pp_xstrdup("__TIME__"), pp_xstrdup(buf) ); + pp_add_define( "__TIME__", buf ); - ppp = pp_add_define( pp_xstrdup("__FILE__"), pp_xstrdup("") ); + ppp = pp_add_define( "__FILE__", "" ); if(ppp) ppp->type = def_special; - ppp = pp_add_define( pp_xstrdup("__LINE__"), pp_xstrdup("") ); + ppp = pp_add_define( "__LINE__", "" ); if(ppp) ppp->type = def_special; } diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 615a450..288d709 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -204,7 +204,7 @@ char *pp_xstrdup(const char *str); pp_entry_t *pplookup(const char *ident); int pp_push_define_state(void); void pp_pop_define_state(void); -pp_entry_t *pp_add_define(char *def, char *text); +pp_entry_t *pp_add_define(const char *def, const char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp); void pp_del_define(const char *name); void *pp_open_include(const char *name, const char *parent_name, char **newpath);

1 0

Matteo Bruni : wpp: Free strings on define deletion (Valgrind).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: e32598b04667472be33ffea3ad1e7f9ba6af921e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32598b04667472be33ffea3a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 14:39:57 2011 +0100 wpp: Free strings on define deletion (Valgrind). --- libs/wpp/preproc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 2eb3133..c88bff5 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -310,6 +310,9 @@ void pp_del_define(const char *name) return; } + free( ppp->ident ); + free( ppp->subst.text ); + free( ppp->filename ); free_pp_entry( ppp, pphash(name) ); if(pp_status.debug)

1 0

Matteo Bruni : d3dx9/tests: Remove spurious assignment (LLVM/Clang).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: ffe65c27211dc4d3a8603badef4f5b3550fae9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe65c27211dc4d3a8603bade… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 19:49:45 2011 +0100 d3dx9/tests: Remove spurious assignment (LLVM/Clang). --- dlls/d3dx9_36/tests/math.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index e455a96..5ad1924 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -935,7 +935,6 @@ static void D3DXQuaternionTest(void) ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); /* Test if |w|>1.0f */ expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f; - expected = 0.0f; D3DXQuaternionToAxisAngle(&q,&axis,&angle); expect_vec3(expectedvec,axis); /* Test the null quaternion */

1 0

Matteo Bruni : d3dx9: Remove an unnecessary initialization (LLVM/Clang).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 6505aed5980083c3d180aa8f2815c996e1687ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6505aed5980083c3d180aa8f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 20:17:14 2011 +0100 d3dx9: Remove an unnecessary initialization (LLVM/Clang). --- dlls/d3dx9_36/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f107bbf..1c40d96 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -66,7 +66,7 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, UINT srclevel, DWORD filter) { - UINT level = srclevel + 1; + UINT level; HRESULT hr; D3DRESOURCETYPE type;

1 0

Matteo Bruni : d3dx9: Remove a couple of spurious assignments (LLVM/Clang).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: ed1b396b66d27fa33e402476ab17636cff2b52ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1b396b66d27fa33e402476a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 20:16:47 2011 +0100 d3dx9: Remove a couple of spurious assignments (LLVM/Clang). --- dlls/d3dx9_36/mesh.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6a74442..d9dd01f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -511,7 +511,6 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR temp.y = 0.0f; temp.z = 0.0f; temp1 = temp; - d = 0.0f; *pradius = 0.0f; for(i=0; i<numvertices; i++) @@ -1375,7 +1374,6 @@ HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT vertex = 0; face = 0; - stack = 0; delta_radius = radius1 - radius2; radius = radius1;

1 0

Matteo Bruni : d3dcompiler: Fix initial allocation (Valgrind).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 005910957be3d4bdb6479cad511357f0bfa1cd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005910957be3d4bdb6479cad5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 7 14:35:37 2011 +0100 d3dcompiler: Fix initial allocation (Valgrind). --- dlls/d3dcompiler_43/compiler.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 42ad09b..8527870 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -206,13 +206,13 @@ static void *wpp_open_mem(const char *filename, int type) { if(includes_capacity == 0) { - includes = HeapAlloc(GetProcessHeap(), 0, INCLUDES_INITIAL_CAPACITY); + includes = HeapAlloc(GetProcessHeap(), 0, INCLUDES_INITIAL_CAPACITY * sizeof(*includes)); if(includes == NULL) { ERR("Error allocating memory for the loaded includes structure\n"); goto error; } - includes_capacity = INCLUDES_INITIAL_CAPACITY; + includes_capacity = INCLUDES_INITIAL_CAPACITY * sizeof(*includes); } else {

1 0

Charles Davis : ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 03c29bf7f5e2d72b327c67643a1830c6146871df URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c29bf7f5e2d72b327c67643… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Feb 18 10:36:24 2011 -0700 ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS. --- dlls/ntdll/cdrom.c | 153 +++++++-------------------------------------------- 1 files changed, 21 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 6a6d8e0..c51ef6b 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1441,6 +1441,9 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW { int ret = STATUS_NOT_SUPPORTED; int io = -1; +#ifdef __APPLE__ + dk_cd_read_t cdrd; +#endif TRACE("RAW_READ_INFO: DiskOffset=%i,%i SectorCount=%i TrackMode=%i\n buffer=%p len=%i sz=%p\n", raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz); @@ -1510,154 +1513,40 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW return STATUS_INVALID_PARAMETER; } #elif defined(__APPLE__) + /* Mac OS lets us read multiple parts of the sector at a time. + * We can read all the sectors in at once, unlike Linux. + */ + memset(&cdrd, 0, sizeof(cdrd)); + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeWhole; + cdrd.buffer = buffer; + cdrd.bufferLength = raw->SectorCount * kCDSectorSizeWhole; switch (raw->TrackMode) { case YellowMode2: - { - /* Mac OS, on the other hand, DOES read only one part of the sector - * at a time. Therefore, we have to read each part of the sector, in - * order, to get the whole raw sector in. - * This means that we have to read each sector one at a time, as on - * Linux. - */ - dk_cd_read_t cdrd; - UInt64 lba = raw->DiskOffset.QuadPart >> 11; - PBYTE bp; - int i; - - for (i = 0, bp = buffer; i < raw->SectorCount; - i++, lba++, bp += kCDSectorSizeWhole) - { - cdrd.offset = lba * kCDSectorSizeWhole; - cdrd.sectorType = kCDSectorTypeMode2; - - /* First, the sync area */ - cdrd.sectorArea = kCDSectorAreaSync; - cdrd.buffer = bp; - cdrd.bufferLength = 12; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i; - return CDROM_GetStatusCode(io); - } - - /* Then the header */ - cdrd.offset += 12; - cdrd.sectorArea = kCDSectorAreaHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 12; - cdrd.bufferLength = 4; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 12; - return CDROM_GetStatusCode(io); - } - - /* And finally the sector proper */ - cdrd.offset += 4; - cdrd.sectorArea = kCDSectorAreaUser; - cdrd.buffer = (PBYTE)cdrd.buffer + 4; - cdrd.bufferLength = kCDSectorSizeMode2; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 16; - return CDROM_GetStatusCode(io); - } - } - + cdrd.sectorType = kCDSectorTypeMode2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaUser; break; - } case XAForm2: - { - /* Same here */ - dk_cd_read_t cdrd; - UInt64 lba = raw->DiskOffset.QuadPart >> 11; - PBYTE bp; - int i; - - for (i = 0, bp = buffer; i < raw->SectorCount; - i++, lba++, bp += kCDSectorSizeWhole) - { - cdrd.offset = lba * kCDSectorSizeWhole; - cdrd.sectorType = kCDSectorTypeMode2Form2; - - /* First, the sync area */ - cdrd.sectorArea = kCDSectorAreaSync; - cdrd.buffer = bp; - cdrd.bufferLength = 12; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i; - return CDROM_GetStatusCode(io); - } - - /* Then the header */ - cdrd.offset += 12; - cdrd.sectorArea = kCDSectorAreaHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 12; - cdrd.bufferLength = 4; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 12; - return CDROM_GetStatusCode(io); - } - - /* And the sub-header */ - cdrd.offset += 4; - cdrd.sectorArea = kCDSectorAreaSubHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 4; - cdrd.bufferLength = 8; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 16; - return CDROM_GetStatusCode(io); - } - - /* And finally the sector proper */ - cdrd.offset += 8; - cdrd.sectorArea = kCDSectorAreaUser; - cdrd.buffer = (PBYTE)cdrd.buffer + 8; - cdrd.bufferLength = kCDSectorSizeMode2; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 24; - return CDROM_GetStatusCode(io); - } - } - + cdrd.sectorType = kCDSectorTypeMode2Form2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaSubHeader | kCDSectorAreaUser; break; - } case CDDA: - { - /* With CDDA, the whole raw sector is considered user data, so there's - * no need to read one at a time. - */ - dk_cd_read_t cdrd; - - cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeCDDA; - cdrd.sectorArea = kCDSectorAreaUser; cdrd.sectorType = kCDSectorTypeCDDA; - cdrd.buffer = buffer; - cdrd.bufferLength = len < raw->SectorCount*kCDSectorSizeCDDA ? len : - raw->SectorCount*kCDSectorSizeCDDA; - - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) return CDROM_GetStatusCode(io); + cdrd.sectorArea = kCDSectorAreaUser; break; - } default: FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = cdrd.bufferLength; + return CDROM_GetStatusCode(io); + } #else switch (raw->TrackMode) {

1 0

Andrew Nguyen : configure: Check for additional libxml2 headers to reject inadequate libxml2 versions .
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 6097f2faf174c30a6c3893d4a72ad7bfb9acbd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6097f2faf174c30a6c3893d4a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Feb 21 05:01:50 2011 -0600 configure: Check for additional libxml2 headers to reject inadequate libxml2 versions. --- configure | 44 ++++++++++++++++++++++++-------------------- configure.ac | 40 +++++++++++++++++++++------------------- include/config.h.in | 6 ++++++ 3 files changed, 51 insertions(+), 39 deletions(-) diff --git a/configure b/configure index 839d254..a19e6b8 100755 --- a/configure +++ b/configure @@ -9179,14 +9179,22 @@ then ac_xml_cflags="`xml2-config --cflags 2>/dev/null`" fi CPPFLAGS="$CPPFLAGS $ac_xml_cflags" - for ac_header in libxml/parser.h + for ac_header in libxml/parser.h libxml/xmlsave.h libxml/SAX2.h do : - ac_fn_c_check_header_mongrel "$LINENO" "libxml/parser.h" "ac_cv_header_libxml_parser_h" "$ac_includes_default" -if test "x$ac_cv_header_libxml_parser_h" = x""yes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXML_PARSER_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseMemory in -lxml2" >&5 + +fi + +done + + if test "$ac_cv_header_libxml_parser_h" = "yes" -a "$ac_cv_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_header_libxml_SAX2_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseMemory in -lxml2" >&5 $as_echo_n "checking for xmlParseMemory in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlParseMemory+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -9226,11 +9234,11 @@ if test "x$ac_cv_lib_xml2_xmlParseMemory" = x""yes; then : $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h - XML2LIBS="$ac_xml_libs" - XML2INCL="$ac_xml_cflags" + XML2LIBS="$ac_xml_libs" + XML2INCL="$ac_xml_cflags" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlReadMemory in -lxml2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlReadMemory in -lxml2" >&5 $as_echo_n "checking for xmlReadMemory in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -9272,7 +9280,7 @@ $as_echo "#define HAVE_XMLREADMEMORY 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlNewDocPI in -lxml2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlNewDocPI in -lxml2" >&5 $as_echo_n "checking for xmlNewDocPI in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -9314,7 +9322,7 @@ $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetParserStructuredErrors in -lxml2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetParserStructuredErrors in -lxml2" >&5 $as_echo_n "checking for xmlSchemaSetParserStructuredErrors in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -9356,7 +9364,7 @@ $as_echo "#define HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5 $as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -9398,7 +9406,7 @@ $as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in -lxml2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in -lxml2" >&5 $as_echo_n "checking for xmlFirstElementChild in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlFirstElementChild+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -9440,7 +9448,7 @@ $as_echo "#define HAVE_XMLFIRSTELEMENTCHILD 1" >>confdefs.h fi - ac_fn_c_check_type "$LINENO" "xmlDocProperties" "ac_cv_type_xmlDocProperties" "#include <libxml/tree.h> + ac_fn_c_check_type "$LINENO" "xmlDocProperties" "ac_cv_type_xmlDocProperties" "#include <libxml/tree.h> " if test "x$ac_cv_type_xmlDocProperties" = x""yes; then : @@ -9448,18 +9456,14 @@ $as_echo "#define HAVE_XMLDOC_PROPERTIES 1" >>confdefs.h fi - -fi - -done - + fi CPPFLAGS="$ac_save_CPPFLAGS" fi if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then : case "x$with_xml" in - x) as_fn_append wine_warnings "|libxml2 ${notice_platform}development files not found, XML won't be supported." ;; + x) as_fn_append wine_warnings "|libxml2 ${notice_platform}development files not found (or too old), XML won't be supported." ;; xno) ;; - *) as_fn_error $? "libxml2 ${notice_platform}development files not found, XML won't be supported. + *) as_fn_error $? "libxml2 ${notice_platform}development files not found (or too old), XML won't be supported. This is an error since --with-xml was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 979b1cd..a68ca49 100644 --- a/configure.ac +++ b/configure.ac @@ -1154,28 +1154,30 @@ then ac_xml_cflags="`xml2-config --cflags 2>/dev/null`" fi CPPFLAGS="$CPPFLAGS $ac_xml_cflags" - AC_CHECK_HEADERS(libxml/parser.h, - [AC_CHECK_LIB(xml2, xmlParseMemory, - [AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library]) - XML2LIBS="$ac_xml_libs" - XML2INCL="$ac_xml_cflags"],,$ac_xml_libs) - AC_CHECK_LIB(xml2, xmlReadMemory, - [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) - AC_CHECK_LIB(xml2, xmlNewDocPI, - [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) - AC_CHECK_LIB(xml2, xmlSchemaSetParserStructuredErrors, - [AC_DEFINE(HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetParserStructuredErrors function])],,$ac_xml_libs) - AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, - [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) - AC_CHECK_LIB(xml2, xmlFirstElementChild, - [AC_DEFINE(HAVE_XMLFIRSTELEMENTCHILD,1,[Define if libxml2 has the xmlFirstElementChild function])],,$ac_xml_libs) - AC_CHECK_TYPE([xmlDocProperties], - [AC_DEFINE(HAVE_XMLDOC_PROPERTIES,1,[Define if libxml2 has the xmlDocProperties enum])],,[[#include <libxml/tree.h>]]) - ]) + AC_CHECK_HEADERS([libxml/parser.h libxml/xmlsave.h libxml/SAX2.h]) + if test "$ac_cv_header_libxml_parser_h" = "yes" -a "$ac_cv_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_header_libxml_SAX2_h" = "yes" + then + AC_CHECK_LIB(xml2, xmlParseMemory, + [AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library]) + XML2LIBS="$ac_xml_libs" + XML2INCL="$ac_xml_cflags"],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlReadMemory, + [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlNewDocPI, + [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlSchemaSetParserStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetParserStructuredErrors function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlFirstElementChild, + [AC_DEFINE(HAVE_XMLFIRSTELEMENTCHILD,1,[Define if libxml2 has the xmlFirstElementChild function])],,$ac_xml_libs) + AC_CHECK_TYPE([xmlDocProperties], + [AC_DEFINE(HAVE_XMLDOC_PROPERTIES,1,[Define if libxml2 has the xmlDocProperties enum])],,[[#include <libxml/tree.h>]]) + fi CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_WARNING_WITH(xml,[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"], - [libxml2 ${notice_platform}development files not found, XML won't be supported.]) + [libxml2 ${notice_platform}development files not found (or too old), XML won't be supported.]) if test "x$with_xslt" != "xno" then diff --git a/include/config.h.in b/include/config.h.in index 0b16b35..7195429 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -383,6 +383,12 @@ /* Define to 1 if you have the <libxml/parser.h> header file. */ #undef HAVE_LIBXML_PARSER_H +/* Define to 1 if you have the <libxml/SAX2.h> header file. */ +#undef HAVE_LIBXML_SAX2_H + +/* Define to 1 if you have the <libxml/xmlsave.h> header file. */ +#undef HAVE_LIBXML_XMLSAVE_H + /* Define if you have the X Shape extension */ #undef HAVE_LIBXSHAPE

1 0

Alexandre Julliard : ntdll: Improve the error reporting for invalid PE file architectures.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 9eba2de390907870dcc516d4fe5ea28fcdea7360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eba2de390907870dcc516d4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 19 14:10:58 2011 +0100 ntdll: Improve the error reporting for invalid PE file architectures. --- dlls/ntdll/virtual.c | 88 +++++++++++++++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c22455d..0913b71 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1030,6 +1030,60 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /*********************************************************************** + * check_architecture + * + * Check the architecture of a PE binary. + */ +static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) +{ + static const char *arch; + +#ifdef __i386__ + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) + { + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) /* don't warn for a 64-bit exe */ + WARN( "loading amd64 dll in 32-bit mode will fail\n" ); + return STATUS_INVALID_IMAGE_FORMAT; + } +#elif defined(__x86_64__) + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) + { + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) /* don't warn for a 32-bit exe */ + WARN( "loading 32-bit dll in 64-bit mode will fail\n" ); + return STATUS_INVALID_IMAGE_FORMAT; + } +#elif defined(__ARMEL__) + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || + nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) + return STATUS_SUCCESS; +#endif + + switch (nt->FileHeader.Machine) + { + case IMAGE_FILE_MACHINE_UNKNOWN: arch = "Unknown"; break; + case IMAGE_FILE_MACHINE_I860: arch = "I860"; break; + case IMAGE_FILE_MACHINE_I386: arch = "I386"; break; + case IMAGE_FILE_MACHINE_R3000: arch = "R3000"; break; + case IMAGE_FILE_MACHINE_R4000: arch = "R4000"; break; + case IMAGE_FILE_MACHINE_R10000: arch = "R10000"; break; + case IMAGE_FILE_MACHINE_ALPHA: arch = "Alpha"; break; + case IMAGE_FILE_MACHINE_POWERPC: arch = "PowerPC"; break; + case IMAGE_FILE_MACHINE_IA64: arch = "IA-64"; break; + case IMAGE_FILE_MACHINE_ALPHA64: arch = "Alpha-64"; break; + case IMAGE_FILE_MACHINE_AMD64: arch = "AMD-64"; break; + case IMAGE_FILE_MACHINE_ARM: arch = "ARM"; break; + case IMAGE_FILE_MACHINE_THUMB: arch = "ARM Thumb"; break; + case IMAGE_FILE_MACHINE_SPARC: arch = "SPARC"; break; + default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break; + } + ERR( "Trying to load PE image for unsupported architecture %s\n", arch ); + return STATUS_INVALID_IMAGE_FORMAT; +} + + +/*********************************************************************** * stat_mapping_file * * Stat the underlying file for a memory view. @@ -1110,39 +1164,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; if (!imports->Size || !imports->VirtualAddress) imports = NULL; - /* check the architecture */ - -#ifdef __x86_64__ - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) -#elif defined(__ARMEL__) - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_ARM && - nt->FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB) -#else - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) -#endif - { - MESSAGE("Trying to load PE image for unsupported architecture ("); - switch (nt->FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_UNKNOWN: MESSAGE("Unknown"); break; - case IMAGE_FILE_MACHINE_I860: MESSAGE("I860"); break; - case IMAGE_FILE_MACHINE_I386: MESSAGE("I386"); break; - case IMAGE_FILE_MACHINE_R3000: MESSAGE("R3000"); break; - case IMAGE_FILE_MACHINE_R4000: MESSAGE("R4000"); break; - case IMAGE_FILE_MACHINE_R10000: MESSAGE("R10000"); break; - case IMAGE_FILE_MACHINE_ALPHA: MESSAGE("Alpha"); break; - case IMAGE_FILE_MACHINE_POWERPC: MESSAGE("PowerPC"); break; - case IMAGE_FILE_MACHINE_IA64: MESSAGE("IA-64"); break; - case IMAGE_FILE_MACHINE_ALPHA64: MESSAGE("Alpha-64"); break; - case IMAGE_FILE_MACHINE_AMD64: MESSAGE("AMD-64"); break; - case IMAGE_FILE_MACHINE_ARM: MESSAGE("ARM"); break; - case IMAGE_FILE_MACHINE_THUMB: MESSAGE("ARM Thumb"); break; - case IMAGE_FILE_MACHINE_SPARC: MESSAGE("SPARC"); break; - default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break; - } - MESSAGE(")\n"); - goto error; - } + if (check_architecture( nt )) goto error; /* check for non page-aligned binary */

1 0

Alexandre Julliard : kernel32: Use debugstr_a to avoid overflow with user-specified string.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 0fd822f46526df49f5fa29627afbace7ce3d242c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd822f46526df49f5fa29627… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 19 13:06:40 2011 +0100 kernel32: Use debugstr_a to avoid overflow with user-specified string. --- dlls/kernel32/debugger.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index e9b5992..3abffdf 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -253,7 +253,7 @@ void WINAPI OutputDebugStringA( LPCSTR str ) } SERVER_END_REQ; - WARN("%s\n", str); + WARN("%s\n", debugstr_a(str)); /* send string to a system-wide monitor */ /* FIXME should only send to monitor if no debuggers are attached */

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
68
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 February 2011