October 2010 - Wine-Commits

Henri Verbeet : wined3d: Only complain about unsupported filtering if we have a reason to.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: 1e301027dcbeef3f4885ee06d388f9a9318f042a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e301027dcbeef3f4885ee06d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 29 12:25:17 2010 +0200 wined3d: Only complain about unsupported filtering if we have a reason to. --- dlls/wined3d/surface_base.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 1324acf..b9dd634 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -947,11 +947,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D return WINEDDERR_SURFACEBUSY; } - if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) { - /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */ - FIXME("Filters not supported in software blit\n"); - } - /* First check for the validity of source / destination rectangles. * This was verified using a test application + by MSDN. */ @@ -1218,6 +1213,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D if (!dstwidth || !dstheight) /* hmm... stupid program ? */ goto release; + + if (Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT + && (srcwidth != dstwidth || srcheight != dstheight)) + { + /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */ + FIXME("Filter %s not supported in software blit.\n", debug_d3dtexturefiltertype(Filter)); + } + sbase = (BYTE*)slock.pBits+(xsrc.top*slock.Pitch)+xsrc.left*bpp; xinc = (srcwidth << 16) / dstwidth; yinc = (srcheight << 16) / dstheight;

1 0

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

Oct. 29, 2010

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 Oct. 29, 2010

Oct. 29, 2010

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

Nikolay Sivov : msxml3/tests: Some encoding switching tests.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: 843bd250122bc4b2f0e68f450fc04612c3e14441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843bd250122bc4b2f0e68f450… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 01:00:44 2010 +0400 msxml3/tests: Some encoding switching tests. --- dlls/msxml3/saxreader.c | 21 ++++++---- dlls/msxml3/tests/saxreader.c | 83 ++++++++++++++++++++++++++++++++++++++--- dlls/msxml6/regsvr.c | 8 ++++ 3 files changed, 97 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5f04227..3a2e534 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1241,16 +1241,19 @@ static void libxmlSetDocumentLocator( xmlSAXLocatorPtr loc) { saxlocator *This = ctx; - HRESULT hr; + HRESULT hr = S_OK; - if(This->vbInterface) - hr = IVBSAXContentHandler_putref_documentLocator( - This->saxreader->vbcontentHandler, - (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl); - else - hr = ISAXContentHandler_putDocumentLocator( - This->saxreader->contentHandler, - (ISAXLocator*)&This->lpSAXLocatorVtbl); + if(has_content_handler(This)) + { + if(This->vbInterface) + hr = IVBSAXContentHandler_putref_documentLocator( + This->saxreader->vbcontentHandler, + (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl); + else + hr = ISAXContentHandler_putDocumentLocator( + This->saxreader->contentHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl); + } if(FAILED(hr)) format_error_message_from_id(This, hr); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index a932bf9..370f4b3 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,8 @@ #include "wine/test.h" +#include "initguid.h" + typedef enum _CH { CH_ENDTEST, CH_PUTDOCUMENTLOCATOR, @@ -44,6 +46,8 @@ typedef enum _CH { CH_SKIPPEDENTITY } CH; +DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); + static const WCHAR szSimpleXML[] = { '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"','1','.','0','\"',' ','?','>','\n', '<','B','a','n','k','A','c','c','o','u','n','t','>','\n', @@ -478,12 +482,7 @@ static void test_saxreader(void) hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (LPVOID*)&reader); - - if(FAILED(hr)) - { - skip("Failed to create SAXXMLReader instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = ISAXXMLReader_getContentHandler(reader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); @@ -598,14 +597,86 @@ static void test_saxreader(void) SysFreeString(bstrData); } +/* UTF-8 data with UTF-8 BOM and UTF-16 in prolog */ +static const CHAR UTF8BOMTest[] = +"\xEF\xBB\xBF<?xml version = \"1.0\" encoding = \"UTF-16\"?>\n" +"<a></a>\n"; + +struct enc_test_entry_t { + const GUID *guid; + const char *clsid; + const char *data; + HRESULT hr; + int todo; +}; + +static const struct enc_test_entry_t encoding_test_data[] = { + { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", UTF8BOMTest, 0xc00ce56f, 1 }, + { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", UTF8BOMTest, 0xc00ce56f, 1 }, + { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", UTF8BOMTest, S_OK, 0 }, + { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", UTF8BOMTest, S_OK, 0 }, + { 0 } +}; + +static void test_encoding(void) +{ + const struct enc_test_entry_t *entry = encoding_test_data; + static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; + static const CHAR testXmlA[] = "test.xml"; + ISAXXMLReader *reader; + DWORD written; + HANDLE file; + HRESULT hr; + + while (entry->guid) + { + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); + if (hr != S_OK) + { + win_skip("can't create %s instance\n", entry->clsid); + entry++; + continue; + } + + file = CreateFileA(testXmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + WriteFile(file, UTF8BOMTest, sizeof(UTF8BOMTest)-1, &written, NULL); + CloseHandle(file); + + hr = ISAXXMLReader_parseURL(reader, testXmlW); + if (entry->todo) + todo_wine ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); + else + ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); + + DeleteFileA(testXmlA); + ISAXXMLReader_Release(reader); + + entry++; + } +} + START_TEST(saxreader) { + ISAXXMLReader *reader; HRESULT hr; hr = CoInitialize(NULL); ok(hr == S_OK, "failed to init com\n"); + hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, + &IID_ISAXXMLReader, (void**)&reader); + + if(FAILED(hr)) + { + skip("Failed to create SAXXMLReader instance\n"); + CoUninitialize(); + return; + } + ISAXXMLReader_Release(reader); + test_saxreader(); + test_encoding(); CoUninitialize(); } diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index 70a6fc4..dab7272 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -370,6 +370,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.MXXMLWriter", "6.0" }, + { &CLSID_SAXXMLReader60, + "SAX XML Reader 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.SAXXMLReader.6.0", + "6.0" + }, { &CLSID_SAXAttributes60, "SAX Attribute 6.0", NULL,

1 0

Nikolay Sivov : msxml3: Add a helper to check for error handler being set.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: 8f9804ed0bef2810940a49c0ebaf81f577112f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9804ed0bef2810940a49c0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 01:04:44 2010 +0400 msxml3: Add a helper to check for error handler being set. --- dlls/msxml3/saxreader.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3a2e534..1fdf48d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -132,6 +132,12 @@ static inline BOOL has_content_handler(const saxlocator *locator) (!locator->vbInterface && locator->saxreader->contentHandler); } +static inline BOOL has_error_handler(const saxlocator *locator) +{ + return (locator->vbInterface && locator->saxreader->vberrorHandler) || + (!locator->vbInterface && locator->saxreader->errorHandler); +} + static HRESULT namespacePush(saxlocator *locator, int ns) { if(locator->nsStackLast>=locator->nsStackSize) @@ -202,8 +208,7 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) xmlStopParser(This->pParserCtxt); This->ret = hr; - if((This->vbInterface && This->saxreader->vberrorHandler) - || (!This->vbInterface && This->saxreader->errorHandler)) + if(has_error_handler(This)) { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, @@ -1299,8 +1304,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; - if((This->vbInterface && !This->saxreader->vberrorHandler) - || (!This->vbInterface && !This->saxreader->errorHandler)) + if(!has_error_handler(This)) { xmlStopParser(This->pParserCtxt); This->ret = E_FAIL;

1 0

Gustavo Henrique Milaré : shell32: Update Portuguese translation.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

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

Gustavo Henrique Milaré : mshtml: Update Portuguese translation.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

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

Alexandre Julliard : configure: More aggressive disabling of Fortify.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

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

Detlef Riekenberg : include: Add WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard Oct. 29, 2010

Oct. 29, 2010

Module: wine Branch: master Commit: 0140a8aacca6d555563d6af87fea3676c15aefd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0140a8aacca6d555563d6af87… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 28 23:42:00 2010 +0200 include: Add WerReportCreate + WerReportCloseHandle. --- include/werapi.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/werapi.h b/include/werapi.h index 54616db..a1db799 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -25,6 +25,9 @@ extern "C" { #endif + +typedef HANDLE HREPORT; + typedef enum _WER_REGISTER_FILE_TYPE { WerRegFileTypeUserDocument = 1, @@ -32,9 +35,34 @@ typedef enum _WER_REGISTER_FILE_TYPE WerRegFileTypeMax } WER_REGISTER_FILE_TYPE; +typedef struct _WER_REPORT_INFORMATION +{ + DWORD dwSize; + HANDLE hProcess; + WCHAR wzConsentKey[64]; + WCHAR wzFriendlyEventName[128]; + WCHAR wzApplicationName[128]; + WCHAR wzApplicationPath[MAX_PATH]; + WCHAR wzDescription[512]; + HWND hwndParent; +} WER_REPORT_INFORMATION, *PWER_REPORT_INFORMATION; + + +typedef enum _WER_REPORT_TYPE +{ + WerReportNonCritical = 0, + WerReportCritical, + WerReportApplicationCrash, + WerReportApplicationHang, + WerReportKernel, + WerReportInvalid +} WER_REPORT_TYPE; + HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); +HRESULT WINAPI WerReportCloseHandle(HREPORT); +HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HREPORT*); #ifdef __cplusplus }

1 0

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

Oct. 29, 2010

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