wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Francois Gouget : wrc: Fix the spelling of the --endianness option.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 9c11faf619eb5d8b12ef8dfe2878343ff3de6a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c11faf619eb5d8b12ef8dfe2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 15:22:52 2011 +0200 wrc: Fix the spelling of the --endianness option. --- tools/wrc/wrc.c | 8 ++++---- tools/wrc/wrc.man.in | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index b1418c1..2eb5380 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -56,7 +56,7 @@ static const char usage[] = " -D, --define id[=val] Define preprocessor identifier id=val\n" " --debug=nn Set debug level to 'nn'\n" " -E Preprocess only\n" - " --endianess=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" + " --endianness=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" " (win32 only; default is " ENDIAN "-endian)\n" " -F TARGET Synonym for -b for compatibility with windres\n" " -fo FILE Synonym for -o for compatibility with windres\n" @@ -176,7 +176,7 @@ enum long_options_values LONG_OPT_PREPROCESSOR, LONG_OPT_VERSION, LONG_OPT_DEBUG, - LONG_OPT_ENDIANESS, + LONG_OPT_ENDIANNESS, LONG_OPT_PEDANTIC, LONG_OPT_VERIFY_TRANSL }; @@ -186,7 +186,7 @@ static const char short_options[] = static const struct option long_options[] = { { "debug", 1, NULL, LONG_OPT_DEBUG }, { "define", 1, NULL, 'D' }, - { "endianess", 1, NULL, LONG_OPT_ENDIANESS }, + { "endianness", 1, NULL, LONG_OPT_ENDIANNESS }, { "help", 0, NULL, 'h' }, { "include-dir", 1, NULL, 'I' }, { "input", 1, NULL, 'i' }, @@ -396,7 +396,7 @@ int main(int argc,char *argv[]) case LONG_OPT_DEBUG: debuglevel = strtol(optarg, NULL, 0); break; - case LONG_OPT_ENDIANESS: + case LONG_OPT_ENDIANNESS: switch(optarg[0]) { case 'n': diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 16ed347..cfdf800 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -37,7 +37,7 @@ Set debug level to \fInn\fR. The value is a bitmask consisting of 1=verbose, 2=dump internals, 4=resource parser trace, 8=preprocessor messages, 16=preprocessor scanner and 32=preprocessor parser trace. .TP -.I \fB\-\-endianess\fR=\fIe\fR +.I \fB\-\-endianness\fR=\fIe\fR Win32 only; set output byte\-ordering, where \fIe\fR is one of n[ative], l[ittle] or b[ig]. Only resources in source-form can be reordered. Native ordering depends on the system on which \fBwrc\fR was built. You can see

1 0

Francois Gouget : shlwapi/tests: Fix the spelling of IID_Endianness.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 77f68e30f5208ba49d83aa89e1db2c01a5a4225b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f68e30f5208ba49d83aa89e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 15:19:26 2011 +0200 shlwapi/tests: Fix the spelling of IID_Endianness. --- dlls/shlwapi/tests/clsid.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 99bc18a..cf9be96 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -96,7 +96,7 @@ static const GUID * TEST_guids[] = { NULL }; -DEFINE_GUID(IID_Endianess, 0x01020304, 0x0506, 0x0708, 0x09, 0x0A, 0x0B, +DEFINE_GUID(IID_Endianness, 0x01020304, 0x0506, 0x0708, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x0A); static void test_ClassIDs(void) @@ -129,25 +129,25 @@ static void test_ClassIDs(void) } /* Test endianness */ - dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 256); - ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for IID_Endianess\n", dwLen); + dwLen = pSHLWAPI_23(&IID_Endianness, szBuff, 256); + ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for IID_Endianness\n", dwLen); ok(!strcmp(szBuff, "{01020304-0506-0708-090A-0B0C0D0E0F0A}"), - "Endianess Broken, got '%s'\n", szBuff); + "Endianness Broken, got '%s'\n", szBuff); /* test lengths */ szBuff[0] = ':'; - dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 0); + dwLen = pSHLWAPI_23(&IID_Endianness, szBuff, 0); ok(dwLen == (is_vista ? E_FAIL : 0), "accepted bad length\n"); ok(szBuff[0] == ':', "wrote to buffer with no length\n"); szBuff[0] = ':'; - dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 38); + dwLen = pSHLWAPI_23(&IID_Endianness, szBuff, 38); ok(dwLen == (is_vista ? E_FAIL : 0), "accepted bad length\n"); ok(szBuff[0] == ':', "wrote to buffer with no length\n"); szBuff[0] = ':'; - dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 39); + dwLen = pSHLWAPI_23(&IID_Endianness, szBuff, 39); ok(dwLen == (is_vista ? S_OK : 39), "rejected ok length\n"); ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); @@ -156,7 +156,7 @@ static void test_ClassIDs(void) bRet = pSHLWAPI_269(szBuff, &guid); ok(bRet == FALSE, "accepted invalid string\n"); - dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 39); + dwLen = pSHLWAPI_23(&IID_Endianness, szBuff, 39); ok(dwLen == (is_vista ? S_OK : 39), "rejected ok length\n"); ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); }

1 0

Francois Gouget : ntdll/tests: Fix the spelling of IID_Endianness.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 5197ab4e52fdc54a4a61476c8d75cfaacf04ce98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5197ab4e52fdc54a4a61476c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 15:19:17 2011 +0200 ntdll/tests: Fix the spelling of IID_Endianness. --- dlls/ntdll/tests/rtlstr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index a5f0806..5205089 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1830,7 +1830,7 @@ static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-', static const WCHAR szGuid2[] = { '{','0','1','0','2','0','3','0','4','-', '0','5','0','6','-' ,'0','7','0','8','-','0','9','0','A','-', '0','B','0','C','0','D','0','E','0','F','0','A',']','\0' }; -DEFINE_GUID(IID_Endianess, 0x01020304, 0x0506, 0x0708, 0x09, 0x0A, 0x0B, +DEFINE_GUID(IID_Endianness, 0x01020304, 0x0506, 0x0708, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x0A); static void test_RtlGUIDFromString(void) @@ -1844,7 +1844,7 @@ static void test_RtlGUIDFromString(void) ret = pRtlGUIDFromString(&str, &guid); ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); - ok(IsEqualGUID(&guid, &IID_Endianess), "Endianess broken\n"); + ok(IsEqualGUID(&guid, &IID_Endianness), "Endianness broken\n"); str.Length = str.MaximumLength = sizeof(szGuid2) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid2; @@ -1861,9 +1861,9 @@ static void test_RtlStringFromGUID(void) str.Length = str.MaximumLength = 0; str.Buffer = NULL; - ret = pRtlStringFromGUID(&IID_Endianess, &str); + ret = pRtlStringFromGUID(&IID_Endianness, &str); ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); - ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianess broken\n"); + ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianness broken\n"); pRtlFreeUnicodeString(&str); }

1 0

Francois Gouget : wrc: If the message context is 'do not translate', then don't add the string to the PO file.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 32b310c737e80c9080c7031a46164aa105dd652d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b310c737e80c9080c7031a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 14:40:53 2011 +0200 wrc: If the message context is 'do not translate', then don't add the string to the PO file. --- tools/wrc/po.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 3efd208..e882a7c 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -503,6 +503,7 @@ static po_file_t read_po_file( const char *name ) static void add_po_string( po_file_t po, const string_t *msgid, const string_t *msgstr, const language_t *lang ) { + static const char dnt[] = "do not translate"; po_message_t msg; po_message_iterator_t iterator; int codepage; @@ -512,6 +513,12 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * id_buffer = id = convert_msgid_ascii( msgid, 1 ); context = get_message_context( &id ); + if (context && strcmp(context, dnt) == 0) + { + /* This string should not be translated */ + free( id_buffer ); + return; + } if (msgstr) {

1 0

Francois Gouget : kernel32: Fix the CreateMailslot[AW]() spec. The first parameter is an input string.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 7f9972a847365f1aedf6f607e44c23ac3cdd0863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9972a847365f1aedf6f607e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 24 14:29:37 2011 +0200 kernel32: Fix the CreateMailslot[AW]() spec. The first parameter is an input string. --- dlls/kernel32/kernel32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f08ddea..eb6e1e6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -236,8 +236,8 @@ @ stdcall CreateJobObjectW(ptr wstr) # @ stub CreateJobSet @ stub CreateKernelThread -@ stdcall CreateMailslotA(ptr long long ptr) -@ stdcall CreateMailslotW(ptr long long ptr) +@ stdcall CreateMailslotA(str long long ptr) +@ stdcall CreateMailslotW(wstr long long ptr) @ stdcall CreateMemoryResourceNotification(long) @ stdcall CreateMutexA(ptr long str) @ stdcall CreateMutexExA(ptr str long long)

1 0

Francois Gouget : programs: Document the reason for the WriteConsole() fall back.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 5bc1aff578f1754a1834d221ae9fe6fcefbcef5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc1aff578f1754a1834d221a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 14:29:31 2011 +0200 programs: Document the reason for the WriteConsole() fall back. --- programs/hostname/hostname.c | 4 ++++ programs/ipconfig/ipconfig.c | 4 ++++ programs/reg/reg.c | 4 ++++ programs/taskkill/taskkill.c | 4 ++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 77ff23b..8bf8676 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -53,6 +53,10 @@ static int hostname_vprintfW(const WCHAR *msg, va_list va_args) DWORD len; char *msgA; + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 14974ae..37e7099 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -40,6 +40,10 @@ static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) DWORD len; char *msgA; + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0f8aa15..8a6ffc4 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -38,6 +38,10 @@ static int reg_printfW(const WCHAR *msg, ...) DWORD len; char *msgA; + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 1dc1fcc..c6423c4 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -50,6 +50,10 @@ static int taskkill_vprintfW(const WCHAR *msg, va_list va_args) DWORD len; char *msgA; + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len);

1 0

Nikolay Sivov : msxml3: Store class version for MXWriter instance.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 283276d6eaab82c298f646623d4ee0adf2db8db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283276d6eaab82c298f646623… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 24 16:06:58 2011 +0400 msxml3: Store class version for MXWriter instance. --- dlls/msxml3/factory.c | 10 +++++++--- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/mxwriter.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 2d8855d..2d1a42f 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -75,7 +75,12 @@ static const struct clsid_version_t clsid_versions_table[] = { &CLSID_XMLSchemaCache26, MSXML_DEFAULT }, { &CLSID_XMLSchemaCache30, MSXML3 }, { &CLSID_XMLSchemaCache40, MSXML4 }, - { &CLSID_XMLSchemaCache60, MSXML6 } + { &CLSID_XMLSchemaCache60, MSXML6 }, + + { &CLSID_MXXMLWriter, MSXML_DEFAULT }, + { &CLSID_MXXMLWriter30, MSXML3 }, + { &CLSID_MXXMLWriter40, MSXML4 }, + { &CLSID_MXXMLWriter60, MSXML6 } }; static MSXML_VERSION get_msxml_version(const GUID *clsid) @@ -264,7 +269,6 @@ static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create }; static ClassFactory saxreadcf = { { &ClassFactoryVtbl }, SAXXMLReader_create }; static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; -static ClassFactory mxwritercf = { { &ClassFactoryVtbl }, MXWriter_create }; static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; /****************************************************************** @@ -335,7 +339,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_MXXMLWriter40 ) || IsEqualCLSID( rclsid, &CLSID_MXXMLWriter60 ) ) { - cf = &mxwritercf.IClassFactory_iface; + return DOMClassFactory_Create(rclsid, riid, ppv, MXWriter_create); } else if( IsEqualCLSID( rclsid, &CLSID_MXNamespaceManager ) || IsEqualCLSID( rclsid, &CLSID_MXNamespaceManager40 ) || diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index a1fdf01..e7f82ea 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -435,7 +435,7 @@ extern HRESULT XMLDocument_create(IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT SAXXMLReader_create(IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT XMLHTTPRequest_create(IUnknown*, void **) DECLSPEC_HIDDEN; extern HRESULT XSLTemplate_create(IUnknown*, void**) DECLSPEC_HIDDEN; -extern HRESULT MXWriter_create(IUnknown*,void**) DECLSPEC_HIDDEN; +extern HRESULT MXWriter_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT MXNamespaceManager_create(IUnknown*,void**) DECLSPEC_HIDDEN; static inline const CLSID* DOMDocument_version(MSXML_VERSION v) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 54b7758..60ac35f 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -62,6 +62,7 @@ typedef struct _mxwriter ISAXContentHandler ISAXContentHandler_iface; LONG ref; + MSXML_VERSION class_version; VARIANT_BOOL props[MXWriter_LastProp]; BOOL prop_changed; @@ -881,7 +882,7 @@ static const struct ISAXContentHandlerVtbl mxwriter_saxcontent_vtbl = mxwriter_saxcontent_skippedEntity }; -HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) +HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *pUnkOuter, void **ppObj) { static const WCHAR version10W[] = {'1','.','0',0}; mxwriter *This; @@ -897,6 +898,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->IMXWriter_iface.lpVtbl = &mxwriter_vtbl; This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; + This->class_version = version; This->props[MXWriter_BOM] = VARIANT_TRUE; This->props[MXWriter_DisableEscaping] = VARIANT_FALSE; @@ -921,7 +923,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) #else -HRESULT MXWriter_create(IUnknown *pUnkOuter, void **obj) +HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *pUnkOuter, void **obj) { MESSAGE("This program tried to use a MXXMLWriter object, but\n" "libxml2 support was not present at compile time.\n");

1 0

Nikolay Sivov : msxml3: Make version dependency checks more flexible, move CLSID checks to factory creation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4877da66b3ce57e0c9cdeb01b2b9fea7a4aaf102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4877da66b3ce57e0c9cdeb01b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 24 16:00:16 2011 +0400 msxml3: Make version dependency checks more flexible, move CLSID checks to factory creation. --- dlls/msxml3/domdoc.c | 36 +++++++---------------------- dlls/msxml3/factory.c | 51 ++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/msxml_private.h | 6 ++-- dlls/msxml3/schema.c | 30 +++++++++---------------- dlls/msxml3/stylesheet.c | 2 +- 6 files changed, 71 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4877da66b3ce57e0c9cde…

1 0

Nikolay Sivov : msxml3: Implement put_version() for MXWriter.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 74a7edd41ba79881c0a54ebf93878d394674ef77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a7edd41ba79881c0a54ebf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 24 13:25:29 2011 +0400 msxml3: Implement put_version() for MXWriter. --- dlls/msxml3/mxwriter.c | 13 ++++++++++--- dlls/msxml3/tests/saxreader.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b99366e..54b7758 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1,7 +1,7 @@ /* * MXWriter implementation * - * Copyright 2011 Nikolay Sivov for CodeWeaversы + * Copyright 2011 Nikolay Sivov for CodeWeavers * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or @@ -525,8 +525,15 @@ static HRESULT WINAPI mxwriter_get_omitXMLDeclaration(IMXWriter *iface, VARIANT_ static HRESULT WINAPI mxwriter_put_version(IMXWriter *iface, BSTR version) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(version)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(version)); + + if (!version) return E_INVALIDARG; + + SysFreeString(This->version); + This->version = SysAllocString(version); + + return S_OK; } static HRESULT WINAPI mxwriter_get_version(IMXWriter *iface, BSTR *version) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 53ce8dc..cc123ff 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1191,6 +1191,34 @@ static void test_mxwriter_properties(void) ok(!lstrcmpW(str, _bstr_("1.0")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* store version string as is */ + hr = IMXWriter_put_version(writer, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IMXWriter_put_version(writer, _bstr_("1.0")); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_put_version(writer, _bstr_("")); + ok(hr == S_OK, "got %08x\n", hr); + hr = IMXWriter_get_version(writer, &str); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(str, _bstr_("")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IMXWriter_put_version(writer, _bstr_("a.b")); + ok(hr == S_OK, "got %08x\n", hr); + hr = IMXWriter_get_version(writer, &str); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(str, _bstr_("a.b")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IMXWriter_put_version(writer, _bstr_("2.0")); + ok(hr == S_OK, "got %08x\n", hr); + hr = IMXWriter_get_version(writer, &str); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(str, _bstr_("2.0")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IMXWriter_Release(writer); free_bstrs(); }

1 0

Piotr Caban : msvcp90: Added basic_streambuf<char>::{Lock, Unlock} implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4fd4a8aeb35d5ce73aa21f4699557ab899049fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd4a8aeb35d5ce73aa21f469… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:39:12 2011 +0200 msvcp90: Added basic_streambuf<char>::{Lock, Unlock} implementation. --- dlls/msvcp90/ios.c | 9 +++++++-- dlls/msvcp90/msvcp90.h | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index eef506a..84dfb17 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -923,6 +923,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; + mutex_ctor(&this->lock); return this; } @@ -934,6 +935,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; + mutex_ctor(&this->lock); this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -948,6 +950,7 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); + mutex_dtor(&this->lock); locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -1051,7 +1054,8 @@ void __thiscall basic_streambuf_char__Init_empty(basic_streambuf_char *this) DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Lock, 4) void __thiscall basic_streambuf_char__Lock(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEHXZ */ @@ -1087,7 +1091,8 @@ streamsize __thiscall basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Unlock, 4) void __thiscall basic_streambuf_char__Unlock(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + mutex_unlock(&this->lock); } /* ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADIH@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d80c361..7c331b5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -218,3 +218,8 @@ void __thiscall _Lockit_dtor(_Lockit*); typedef struct { void *mutex; } mutex; + +mutex* __thiscall mutex_ctor(mutex*); +void __thiscall mutex_dtor(mutex*); +void __thiscall mutex_lock(mutex*); +void __thiscall mutex_unlock(mutex*);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
77
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 August 2011