October 2010 - Wine-commits

Aric Stewart : winegstreamer: Add gstreamer audio convert transform filter.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 0e55930effbfb5b6e79a77b5da4f4e0e5a52455e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e55930effbfb5b6e79a77b5d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 28 14:42:33 2010 -0500 winegstreamer: Add gstreamer audio convert transform filter. --- dlls/winegstreamer/gst_guids.h | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gsttffilter.c | 113 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/main.c | 35 ++++++++++++ 4 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 092c4f6..089cd9d 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32, 0x4a, 0x00, 0xe0, 0x03, 0x86, 0xa8); DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a838179..741fdf4 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -40,6 +40,7 @@ /* enum media */ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); +IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 6237fac..9339299 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -690,6 +690,119 @@ IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkout, HRESULT *phr) return obj; } +static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)iface; + TRACE("%p %p\n", This, amt); + dump_AM_MEDIA_TYPE(amt); + + if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || + !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || + !IsEqualGUID(&amt->formattype, &FORMAT_WaveFormatEx)) + return S_FALSE; + return S_OK; +} + +static HRESULT WINAPI Gstreamer_AudioConvert_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +{ + return S_OK; +} + +static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + WAVEFORMATEX *inwfe; + WAVEFORMATEX *outwfe; + WAVEFORMATEXTENSIBLE *outwfx; + HRESULT hr; + int inisfloat = 0, indepth; + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return E_FAIL; + + FreeMediaType(outpmt); + *outpmt = *amt; + outpmt->pUnk = NULL; + outpmt->cbFormat = sizeof(WAVEFORMATEXTENSIBLE); + outpmt->pbFormat = CoTaskMemAlloc(outpmt->cbFormat); + + inwfe = (WAVEFORMATEX*)amt->pbFormat; + indepth = inwfe->wBitsPerSample; + if (inwfe->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + WAVEFORMATEXTENSIBLE *inwfx = (WAVEFORMATEXTENSIBLE*)inwfe; + inisfloat = IsEqualGUID(&inwfx->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); + if (inwfx->Samples.wValidBitsPerSample) + indepth = inwfx->Samples.wValidBitsPerSample; + } + + capsin = gst_caps_new_simple(inisfloat ? "audio/x-raw-float" : "audio/x-raw-int", + "endianness", G_TYPE_INT, 1234, + "width", G_TYPE_INT, inwfe->wBitsPerSample, + "depth", G_TYPE_INT, indepth, + "channels", G_TYPE_INT, inwfe->nChannels, + "rate", G_TYPE_INT, inwfe->nSamplesPerSec, + NULL); + + outwfe = (WAVEFORMATEX*)outpmt->pbFormat; + outwfx = (WAVEFORMATEXTENSIBLE*)outwfe; + outwfe->wFormatTag = WAVE_FORMAT_EXTENSIBLE; + outwfe->nChannels = 2; + outwfe->nSamplesPerSec = inwfe->nSamplesPerSec; + outwfe->wBitsPerSample = 16; + outwfe->nBlockAlign = outwfe->nChannels * outwfe->wBitsPerSample / 8; + outwfe->nAvgBytesPerSec = outwfe->nBlockAlign * outwfe->nSamplesPerSec; + outwfe->cbSize = sizeof(*outwfx) - sizeof(*outwfe); + outwfx->Samples.wValidBitsPerSample = outwfe->wBitsPerSample; + outwfx->dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT; + outwfx->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + + capsout = gst_caps_new_simple("audio/x-raw-int", + "endianness", G_TYPE_INT, 1234, + "width", G_TYPE_INT, outwfe->wBitsPerSample, + "depth", G_TYPE_INT, outwfx->Samples.wValidBitsPerSample, + "channels", G_TYPE_INT, outwfe->nChannels, + "rate", G_TYPE_INT, outwfe->nSamplesPerSec, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + FIXME("%08x\n", hr); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = inwfe->nAvgBytesPerSec; + return hr; +} + +static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_AudioConvert_QueryConnect, + Gstreamer_AudioConvert_SetMediaType, + Gstreamer_AudioConvert_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment +}; + +IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkout, HRESULT *phr) +{ + IUnknown *obj = NULL; + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + *phr = Gstreamer_transform_create(punkout, &CLSID_Gstreamer_AudioConvert, "audioconvert", &Gstreamer_AudioConvert_vtbl, (LPVOID*)&obj); + return obj; +} + HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 6007ac7..ac9e97b 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -49,6 +49,8 @@ static const WCHAR wGstreamer_YUV[] = {'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_AudioConvert[] = +{'G','S','t','r','e','a','m','e','r',' ','A','u','d','i','o','C','o','n','v','e','r','t',' ','f','i','l','t','e','r',0}; static WCHAR wNull[] = {'\0'}; @@ -149,6 +151,32 @@ AMOVIESETUP_FILTER const amfMp3 = amfMp3Pin }; +AMOVIESETUP_PIN amfAudioConvertPin[] = +{ { wNull, + FALSE, FALSE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTaudio + }, + { + wNull, + FALSE, TRUE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTaudio + }, +}; + +AMOVIESETUP_FILTER const amfAudioConvert = +{ &CLSID_Gstreamer_AudioConvert, + wGstreamer_AudioConvert, + MERIT_UNLIKELY, + 2, + amfAudioConvertPin +}; + FactoryTemplate const g_Templates[] = { { wGstreamer_Splitter, @@ -171,6 +199,13 @@ FactoryTemplate const g_Templates[] = { NULL, &amfMp3, }, + { + wGstreamer_AudioConvert, + &CLSID_Gstreamer_AudioConvert, + Gstreamer_AudioConvert_create, + NULL, + &amfAudioConvert, + }, }; const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]);

1 0

Detlef Riekenberg : include: Add WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard 29 Oct '10

29 Oct '10

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

Nikolay Sivov : msxml3/tests: Some encoding switching tests.
by Alexandre Julliard 29 Oct '10

29 Oct '10

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 29 Oct '10

29 Oct '10

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

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

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

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

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

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é : 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