wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Henri Verbeet : wined3d: Move "parse_state" to wined3d_shader_context.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 8a4a76f9a71af30934492c5f28e7c479035a2e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4a76f9a71af30934492c5f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 29 12:25:15 2010 +0200 wined3d: Move "parse_state" to wined3d_shader_context. --- dlls/wined3d/arb_program_shader.c | 28 ++++++++++++---------------- dlls/wined3d/glsl_shader.c | 29 ++++++++++++----------------- dlls/wined3d/shader.c | 5 ++++- dlls/wined3d/wined3d_private.h | 17 +++++++++-------- 4 files changed, 37 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4a76f9a71af30934492…

1 0

Andrew Nguyen : configure: Check for GStreamer functionality present in 0. 10.26.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: de4179741b667274285fe0e26dd8bf299e26e153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4179741b667274285fe0e26… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Oct 29 00:26:04 2010 -0500 configure: Check for GStreamer functionality present in 0.10.26. --- configure | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 10 ++++++---- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/configure b/configure index baebf88..a9e0e76 100755 --- a/configure +++ b/configure @@ -10501,8 +10501,47 @@ then done ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_gst_incl" - ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" +if test "x$ac_cv_header_gst_gstpad_h" = x""yes; then : + ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default" if test "x$ac_cv_header_gst_app_gstappsink_h" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_get_caps_reffed in -lgstreamer-0.10" >&5 +$as_echo_n "checking for gst_pad_get_caps_reffed in -lgstreamer-0.10... " >&6; } +if test "${ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgstreamer-0.10 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gst_pad_get_caps_reffed (); +int +main () +{ +return gst_pad_get_caps_reffed (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed=yes +else + ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" >&5 +$as_echo "$ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" >&6; } +if test "x$ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed" = x""yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_app_buffer_new in -lgstapp-0.10" >&5 $as_echo_n "checking for gst_app_buffer_new in -lgstapp-0.10... " >&6; } if test "${ac_cv_lib_gstapp_0_10_gst_app_buffer_new+set}" = set; then : @@ -10542,13 +10581,18 @@ $as_echo "$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&6; } if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = x""yes; then : GSTREAMER_LIBS="$ac_gst_libs" - GSTREAMER_INCL="$ac_gst_incl" + GSTREAMER_INCL="$ac_gst_incl" + +fi fi fi +fi + + fi CPPFLAGS="$ac_save_CPPFLAGS" fi diff --git a/configure.ac b/configure.ac index 50feee4..eb3285a 100644 --- a/configure.ac +++ b/configure.ac @@ -1418,10 +1418,12 @@ then done ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_gst_incl" - AC_CHECK_HEADER([gst/app/gstappsink.h], - [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, - [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") - AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])]) + AC_CHECK_HEADER([gst/gstpad.h], + [AC_CHECK_HEADER([gst/app/gstappsink.h], + [AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed, + [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, + [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") + AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])])])]) fi CPPFLAGS="$ac_save_CPPFLAGS" fi

1 0

Alexandre Julliard : configure: More aggressive disabling of Fortify.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: b10fb86a91c0fcef9db236076929842c8dc45baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10fb86a91c0fcef9db236076… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 14:25:01 2010 +0200 configure: More aggressive disabling of Fortify. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 32efe7f..baebf88 100755 --- a/configure +++ b/configure @@ -12159,7 +12159,7 @@ fi $as_echo "$ac_cv_c_fortify_enabled" >&6; } if test "$ac_cv_c_fortify_enabled" = yes then - EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" fi diff --git a/configure.ac b/configure.ac index 7b6818b..50feee4 100644 --- a/configure.ac +++ b/configure.ac @@ -1690,7 +1690,7 @@ AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes])) if test "$ac_cv_c_fortify_enabled" = yes then - EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" fi dnl **** Check for underscore on external symbols ****

1 0

Aric Stewart : usp10/tests: Update test_ScriptStringXtoCP_CPtoX to test both rtl and ltr characters.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: fa7cc460637eb09ab1d119278ff21b9c7a6dbc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7cc460637eb09ab1d119278… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 28 14:42:39 2010 -0500 usp10/tests: Update test_ScriptStringXtoCP_CPtoX to test both rtl and ltr characters. --- dlls/usp10/tests/usp10.c | 157 ++++++++++++++++++++++++++++------------------ 1 files changed, 97 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa7cc460637eb09ab1d11…

1 0

Gustavo Henrique Milaré : jscript: Update Portuguese translation.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 8b3786f5cf469e5c9ac67bafa34ca5a80a2fe765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3786f5cf469e5c9ac67bafa… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Oct 28 23:39:13 2010 -0200 jscript: Update Portuguese translation. --- dlls/jscript/jscript_Pt.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pt.rc b/dlls/jscript/jscript_Pt.rc index 1ead171..6901800 100644 --- a/dlls/jscript/jscript_Pt.rc +++ b/dlls/jscript/jscript_Pt.rc @@ -27,8 +27,10 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Erro ao converter objeto em tipo primitivo" IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" + IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript fora de alcance" IDS_CREATE_OBJ_ERROR "O servidor de automação não conseguiu criar o objeto" IDS_NO_PROPERTY "O objeto não suporta esta propriedade ou método" + IDS_UNSUPPORTED_ACTION "O objeto não suporta esta ação" IDS_ARG_NOT_OPT "Argumento não opcional" IDS_SYNTAX_ERROR "Erro de sintaxe" IDS_SEMICOLON "';' esperado" @@ -42,6 +44,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Atribuição ilegal" IDS_UNDEFINED "'|' é indefinido" IDS_NOT_BOOL "Objeto boleano esperado" + IDS_NOT_VBARRAY "Objeto VBArray esperado" IDS_JSCRIPT_EXPECTED "Objeto JScript esperado" IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na expressão regular" IDS_URI_INVALID_CHAR "URI a ser codificado contém caracteres inválidos" @@ -55,8 +58,10 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Erro ao converter objecto em tipo primitivo" IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" + IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript fora de alcance" IDS_CREATE_OBJ_ERROR "O servidor de automação não conseguiu criar o objecto" IDS_NO_PROPERTY "O objecto não suporta esta propriedade ou método" + IDS_UNSUPPORTED_ACTION "O objecto não suporta esta acção" IDS_ARG_NOT_OPT "Argumento não opcional" IDS_SYNTAX_ERROR "Erro de sintaxe" IDS_SEMICOLON "';' esperado" @@ -70,6 +75,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Atribuição ilegal" IDS_UNDEFINED "'|' é indefinido" IDS_NOT_BOOL "Objecto boleano esperado" + IDS_NOT_VBARRAY "Objecto VBArray esperado" IDS_JSCRIPT_EXPECTED "Objecto JScript esperado" IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na expressão regular" IDS_URI_INVALID_CHAR "URI a ser codificado contém caracteres inválidos"

1 0

Gustavo Henrique Milaré : mshtml: Update Portuguese translation.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 3792143233bf6b728578f6e1405f05ae1fdd6506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3792143233bf6b728578f6e14… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Oct 28 23:31:06 2010 -0200 mshtml: Update Portuguese translation. --- dlls/mshtml/Pt.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 478272f..0788a79 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -23,6 +23,14 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_STATUS_DONE "Concluído" + IDS_STATUS_DOWNLOADINGFROM "Fazendo o download de %s..." +} + STRINGTABLE { IDS_HTMLDISABLED "A interpretação de HTML está desativada." @@ -35,6 +43,14 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { + IDS_STATUS_DONE "Concluído" + IDS_STATUS_DOWNLOADINGFROM "A descarregar de %s..." +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE +{ IDS_HTMLDISABLED "A interpretação de HTML está desactivada." IDS_HTMLDOCUMENT "Documento HTML" IDS_DOWNLOADING "A descarregar..."

1 0

Gustavo Henrique Milaré : shell32: Update Portuguese translation.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 46a2476781ff5b12026160e81143817a8e8ce076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a2476781ff5b12026160e81… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Oct 28 23:27:17 2010 -0200 shell32: Update Portuguese translation. --- dlls/shell32/shell32_Pt.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc index d0e48d0..59c2352 100644 --- a/dlls/shell32/shell32_Pt.rc +++ b/dlls/shell32/shell32_Pt.rc @@ -3,6 +3,7 @@ * Copyright 2003 Marcelo Duarte * Copyright 2006-2007 Américo José Melo * Copyright 2009 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -417,14 +418,35 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Configurações locais\\Histórico" IDS_PROGRAM_FILES "Arquivos de programas" + IDS_PROGRAM_FILESX86 "Arquivos de programas (x86)" IDS_MYPICTURES "Minhas Imagens" IDS_PROGRAM_FILES_COMMON "Arquivos de programas\\Arquivos comuns" + IDS_PROGRAM_FILES_COMMONX86 "Arquivos de programas (x86)\\Arquivos comuns" IDS_COMMON_DOCUMENTS "Documentos" IDS_ADMINTOOLS "Menu Iniciar\\Programas\\Ferramentas Administrativas" IDS_COMMON_MUSIC "Documentos\\Minhas Músicas" IDS_COMMON_PICTURES "Documentos\\Minhas Imagens" IDS_COMMON_VIDEO "Documentos\\Meus Vídeos" IDS_CDBURN_AREA "Configurações locais\\Dados de aplicativos\\Microsoft\\CD Burning" + IDS_CONTACTS "Contatos" + IDS_LINKS "Links" + IDS_PHOTO_ALBUMS "Imagens\\Apresentações" + IDS_PLAYLISTS "Músicas\\Listas de reprodução" + IDS_PUBLIC_DOWNLOADS "Downloads" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Bibliotecas" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "Músicas\\Amostra de músicas" + IDS_SAMPLE_PICTURES "Imagens\\Amostra de imagens" + IDS_SAMPLE_PLAYLISTS "Músicas\\Amostra de listas de reprodução" + IDS_SAMPLE_VIDEOS "Videos\\Amostra de vídeos" + IDS_SAVED_GAMES "Jogos salvos" + IDS_SAVED_SEARCHES "Buscas" + IDS_USER_PROFILES "Usuários" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Documentos" + IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "Nova Pasta" @@ -520,14 +542,35 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Definições locais\\Histórico" IDS_PROGRAM_FILES "Programas" + IDS_PROGRAM_FILESX86 "Programas (x86)" IDS_MYPICTURES "As Minhas Imagens" IDS_PROGRAM_FILES_COMMON "Programas\\Ficheiros comuns" + IDS_PROGRAM_FILES_COMMONX86 "Programas (x86)\\Ficheiros comuns" IDS_COMMON_DOCUMENTS "Os Meus Documentos" IDS_ADMINTOOLS "Menu Iniciar\\Programas\\Ferramentas Administrativas" IDS_COMMON_MUSIC "Os Meus Documentos\\As Minhas Músicas" IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus Vídeos" IDS_CDBURN_AREA "Definições locais\\Dados de aplicação\\Microsoft\\CD Burning" + IDS_CONTACTS "Contatos" + IDS_LINKS "Links" + IDS_PHOTO_ALBUMS "Imagens\\Apresentações" + IDS_PLAYLISTS "Músicas\\Listas de reprodução" + IDS_PUBLIC_DOWNLOADS "Downloads" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Bibliotecas" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "Músicas\\Amostra de músicas" + IDS_SAMPLE_PICTURES "Imagens\\Amostra de imagens" + IDS_SAMPLE_PLAYLISTS "Músicas\\Amostra de listas de reprodução" + IDS_SAMPLE_VIDEOS "Videos\\Amostra de vídeos" + IDS_SAVED_GAMES "Jogos salvos" + IDS_SAVED_SEARCHES "Buscas" + IDS_USER_PROFILES "Utilizadores" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Documentos" + IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "Nova Pasta"

1 0

Charles Davis : kernel32/tests: Fix the mixed-case short path test to actually test something.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 717fc6f3a82516e9326b8b7d7168783594d67d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717fc6f3a82516e9326b8b7d7… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Thu Oct 28 17:57:48 2010 -0600 kernel32/tests: Fix the mixed-case short path test to actually test something. --- dlls/kernel32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 2775ab1..3d32767 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -571,7 +571,7 @@ static void test_ShortPathCase(const char *tmpdir, const char *dirname, /* Now for the real test */ for(i=0;i<strlen(shortbuf);i++) if (i % 2) - shortbuf[i] = toupper(shortbuf[i]); + shortbuf[i] = tolower(shortbuf[i]); hndl = CreateFileA(shortbuf,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed (%d)\n",GetLastError()); CloseHandle(hndl);

1 0

Nikolay Sivov : msxml3: Trace backend error even when user error handler is not set.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: b1aaa86e145670b510c178c59ff1d06fcc496cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1aaa86e145670b510c178c59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 02:06:33 2010 +0400 msxml3: Trace backend error even when user error handler is not set. --- dlls/msxml3/saxreader.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fd461d1..a1df5c7 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1298,15 +1298,6 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; - if(!has_error_handler(This)) - { - xmlStopParser(This->pParserCtxt); - This->ret = E_FAIL; - return; - } - - FIXME("Error handling is not compatible.\n"); - va_start(args, msg); vsprintf(message, msg, args); va_end(args); @@ -1319,6 +1310,16 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) TRACE("fatal error for %p: %s\n", This, debugstr_w(error)); } + if(!has_error_handler(This)) + { + xmlStopParser(This->pParserCtxt); + This->ret = E_FAIL; + heap_free(error); + return; + } + + FIXME("Error handling is not compatible.\n"); + if(This->vbInterface) { BSTR bstrError = SysAllocString(error); @@ -1788,7 +1789,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz locator->pParserCtxt->userData = locator; This->isParsing = TRUE; - if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; + if(xmlParseDocument(locator->pParserCtxt) == -1) hr = E_FAIL; else hr = locator->ret; This->isParsing = FALSE;

1 0

Nikolay Sivov : msxml3: Build qualified name using libxml2 helper.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 2329d2afddb7d9dc26512ba16777754bcb83db59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2329d2afddb7d9dc26512ba16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 01:14:08 2010 +0400 msxml3: Build qualified name using libxml2 helper. --- dlls/msxml3/saxreader.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 1fdf48d..fd461d1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -182,23 +182,17 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) { - DWORD dLen, dLast; + xmlChar *qname; BSTR bstr; if(!name) return NULL; - if(!prefix || *prefix=='\0') + if(!prefix || !*prefix) return bstr_from_xmlChar(name); - dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0) - + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0); - bstr = SysAllocStringLen(NULL, dLen-1); - if(!bstr) - return NULL; - - dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, bstr, dLen); - bstr[dLast-1] = ':'; - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &bstr[dLast], dLen-dLast); + qname = xmlBuildQName(name, prefix, NULL, 0); + bstr = bstr_from_xmlChar(qname); + xmlFree(qname); return bstr; }

1 0

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 October 2010