wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Nikolay Sivov : msxml3: Create additional node for xml declaration.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: d461d7d2136fcb8fa591784742c31237ad5b10d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d461d7d2136fcb8fa59178474… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 28 12:17:56 2010 +0400 msxml3: Create additional node for xml declaration. --- dlls/msxml3/domdoc.c | 71 ++++++++++++++++++++++++++++++++++++++++--- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 5 +++ dlls/msxml3/tests/domdoc.c | 49 ++++++++++++++++++++++-------- 4 files changed, 109 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 54e4728..cec59e8 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -141,18 +141,75 @@ static xmldoc_priv * create_priv(void) return priv; } +/* links a "<?xml" node as a first child */ +void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) +{ + assert(doc != NULL); + if (doc->standalone != -1) xmlAddPrevSibling( doc->children, node ); +} + +/* unlinks a first "<?xml" child if it was created */ +xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) +{ + xmlNodePtr node; + + assert(doc != NULL); + + if (doc->standalone != -1) + { + node = doc->children; + xmlUnlinkNode( node ); + } + else + node = NULL; + + return node; +} + static xmlDocPtr doparse( char *ptr, int len, const char *encoding ) { + xmlDocPtr doc; + #ifdef HAVE_XMLREADMEMORY /* * use xmlReadMemory if possible so we can suppress * writing errors to stderr */ - return xmlReadMemory( ptr, len, NULL, encoding, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); + doc = xmlReadMemory( ptr, len, NULL, encoding, + XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); #else - return xmlParseMemory( ptr, len ); + doc = xmlParseMemory( ptr, len ); #endif + + /* create first child as a <?xml...?> */ + if (doc && doc->standalone != -1) + { + xmlNodePtr node; + char buff[30]; + xmlChar *xmlbuff = (xmlChar*)buff; + + node = xmlNewDocPI( doc, (xmlChar*)"xml", NULL ); + + /* version attribute can't be omitted */ + sprintf(buff, "version=\"%s\"", doc->version ? (char*)doc->version : "1.0"); + xmlNodeAddContent( node, xmlbuff ); + + if (doc->encoding) + { + sprintf(buff, " encoding=\"%s\"", doc->encoding); + xmlNodeAddContent( node, xmlbuff ); + } + + if (doc->standalone != -2) + { + sprintf(buff, " standalone=\"%s\"", doc->standalone == 0 ? "no" : "yes"); + xmlNodeAddContent( node, xmlbuff ); + } + + xmldoc_link_xmldecl( doc, node ); + } + + return doc; } LONG xmldoc_add_ref(xmlDocPtr doc) @@ -345,7 +402,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = parse_xml(ptr, len); + xmldoc = doparse(ptr, len, NULL); GlobalUnlock(hglobal); if (!xmldoc) @@ -1524,7 +1581,7 @@ static HRESULT WINAPI domdoc_load( { *isSuccessful = VARIANT_TRUE; - TRACE("Using ID_IStream to load Document\n"); + TRACE("Using IStream to load Document\n"); return S_OK; } else @@ -1733,6 +1790,7 @@ static HRESULT WINAPI domdoc_save( domdoc *This = impl_from_IXMLDOMDocument2( iface ); HANDLE handle; xmlSaveCtxtPtr ctx; + xmlNodePtr xmldecl; HRESULT ret = S_OK; TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination), @@ -1788,7 +1846,10 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } + xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; + xmldoc_link_xmldecl(get_doc(This), xmldecl); + /* will close file through close callback */ xmlSaveClose(ctx); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1df3e8b..e0279f1 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -134,6 +134,8 @@ extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); +extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node); +extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 135844f..bbdcb5d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1382,6 +1382,7 @@ static HRESULT WINAPI xmlnode_get_xml( { xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlBufferPtr pXmlBuf; + xmlNodePtr xmldecl; int nSize; TRACE("(%p %d)->(%p)\n", This, This->node->type, xmlString); @@ -1391,6 +1392,8 @@ static HRESULT WINAPI xmlnode_get_xml( *xmlString = NULL; + xmldecl = xmldoc_unlink_xmldecl( This->node->doc ); + pXmlBuf = xmlBufferCreate(); if(pXmlBuf) { @@ -1424,6 +1427,8 @@ static HRESULT WINAPI xmlnode_get_xml( xmlBufferFree(pXmlBuf); } + xmldoc_link_xmldecl( This->node->doc, xmldecl ); + /* Always returns a string. */ if(*xmlString == NULL) *xmlString = SysAllocStringLen( NULL, 0 ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c1440c..cde4c81 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -470,20 +470,8 @@ static void node_to_string(IXMLDOMNode *node, char *buf) } else { - int pos = get_node_position(node); - DOMNodeType parent_type = NODE_INVALID; r = IXMLDOMNode_get_parentNode(node, &new_node); - - /* currently wine doesn't create a node for the <?xml ... ?>. To be able to test query - * results we "fix" it */ - if (r == S_OK) - ole_check(IXMLDOMNode_get_nodeType(new_node, &parent_type)); - if ((parent_type == NODE_DOCUMENT) && type != NODE_PROCESSING_INSTRUCTION && pos==1) - { - todo_wine ok(FALSE, "The first child of the document node in MSXML is the <?xml ... ?> processing instruction\n"); - pos++; - } - wsprintf(buf, "%d", pos); + wsprintf(buf, "%d", get_node_position(node)); buf += strlen(buf); } @@ -2477,6 +2465,40 @@ static void test_get_childNodes(void) IXMLDOMDocument_Release( doc ); } +static void test_get_firstChild(void) +{ + static WCHAR xmlW[] = {'x','m','l',0}; + IXMLDOMDocument *doc; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT r; + BSTR str; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + ok( r == S_OK, "failed with 0x%08x\n", r ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_firstChild( doc, &node ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_nodeName( node, &str ); + ok( r == S_OK, "ret %08x\n", r); + + ok(memcmp(str, xmlW, sizeof(xmlW)) == 0, "expected \"xml\" node name\n"); + + SysFreeString(str); + IXMLDOMNode_Release( node ); + IXMLDOMDocument_Release( doc ); +} + static void test_removeChild(void) { HRESULT r; @@ -5581,6 +5603,7 @@ START_TEST(domdoc) test_getElementsByTagName(); test_get_text(); test_get_childNodes(); + test_get_firstChild(); test_removeChild(); test_replaceChild(); test_removeNamedItem();

1 0

Eric Pouech : dbghelp: Parse correctly DW_LNE_set_discriminator.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 5afe16621b786a11c6d28e54e2fa526240ba100a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afe16621b786a11c6d28e54e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 22:57:33 2010 +0200 dbghelp: Parse correctly DW_LNE_set_discriminator. --- dlls/dbghelp/dwarf.c | 4 ++++ dlls/dbghelp/dwarf.h | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 413ae44..dda1725 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2075,6 +2075,10 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); break; + case DW_LNE_set_discriminator: + WARN("not handled %s\n", traverse.data); + dwarf2_leb128_as_unsigned(&traverse); + break; default: FIXME("Unsupported extended opcode %x\n", extopcode); break; diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 4ecb816..9864ecc 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -421,6 +421,8 @@ enum dwarf_calling_convention #define DW_LNE_end_sequence 0x01 #define DW_LNE_set_address 0x02 #define DW_LNE_define_file 0x03 +/* Dwarf4 new values */ +#define DW_LNE_set_discriminator 0x04 #define DW_CIE_ID ~(0x0)

1 0

Eric Pouech : dbghelp: When unwinding i386 stacks, update CONTEXT with sp/ bp/ip.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: b6c8b8959be4d69db5448281cbddd64b43db228b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c8b8959be4d69db5448281c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 18:55:21 2010 +0200 dbghelp: When unwinding i386 stacks, update CONTEXT with sp/bp/ip. --- dlls/dbghelp/cpu_i386.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index dc00410..a88b00f 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -410,8 +410,23 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO sw_read_mem(csw, frame->AddrFrame.Offset + 2 * sizeof(DWORD), frame->Params, sizeof(frame->Params)); } - goto done_pep; /* just to ensure done_pep label is referenced */ +#ifdef __i386__ + if (context) + { +#define SET(field, seg, reg) \ + switch (frame->field.Mode) \ + { \ + case AddrModeFlat: context->reg = frame->field.Offset; break; \ + case AddrMode1616: context->seg = frame->field.Segment; context->reg = frame->field.Offset; break; \ + default: assert(0); \ + } + SET(AddrStack, SegSs, Esp); + SET(AddrFrame, SegSs, Ebp); + SET(AddrReturn, SegCs, Eip); +#undef SET + } done_pep: +#endif frame->Far = TRUE; frame->Virtual = TRUE;

1 0

Eric Pouech : dbghelp: Correctly handle the RULE_EXPRESSION when computing CFA in dwarf debug info .
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 1c037bf5641d6dab556439882c1dc26d11a96b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c037bf5641d6dab556439882… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 18:55:15 2010 +0200 dbghelp: Correctly handle the RULE_EXPRESSION when computing CFA in dwarf debug info. --- dlls/dbghelp/dwarf.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 274410e..413ae44 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2877,7 +2877,12 @@ static void apply_frame_info(struct module* module, struct cpu_stack_walk* csw, switch (info->cfa_rule) { case RULE_EXPRESSION: - *cfa = *(ULONG_PTR*)eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); + *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); + if (!sw_read_mem(csw, *cfa, cfa, sizeof(*cfa))) + { + WARN("Couldn't read memory at %p\n", (void*)*cfa); + return; + } break; case RULE_VAL_EXPRESSION: *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);

1 0

Eric Pouech : dbghelp: Set the correct word size when unwinding stacks with Dwarf debug info.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: b38cddf4845da65a0b5567aa9fb3e9ecac964766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38cddf4845da65a0b5567aa9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 18:55:09 2010 +0200 dbghelp: Set the correct word size when unwinding stacks with Dwarf debug info. --- dlls/dbghelp/dwarf.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4d7ec0d..274410e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2756,7 +2756,8 @@ static void copy_context_reg(CONTEXT *dstcontext, ULONG_PTR dwregdst, CONTEXT* s memcpy(ptrdst, ptrsrc, szdst); } -static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char* zp, CONTEXT *context) +static ULONG_PTR eval_expression(struct module* module, struct cpu_stack_walk* csw, + const unsigned char* zp, CONTEXT *context) { dwarf2_traverse_context_t ctx; ULONG_PTR reg, sz, tmp, stack[64]; @@ -2767,7 +2768,7 @@ static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char ctx.end_data = zp + 4; len = dwarf2_leb128_as_unsigned(&ctx); ctx.end_data = ctx.data + len; - ctx.word_size = 8; /* FIXME: wordsize!! */ + ctx.word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; while (ctx.data < ctx.end_data) { @@ -2866,7 +2867,8 @@ static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char return stack[sp]; } -static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struct frame_info *info, ULONG_PTR* cfa) +static void apply_frame_info(struct module* module, struct cpu_stack_walk* csw, + CONTEXT *context, struct frame_info *info, ULONG_PTR* cfa) { unsigned int i; ULONG_PTR value; @@ -2875,10 +2877,10 @@ static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struc switch (info->cfa_rule) { case RULE_EXPRESSION: - *cfa = *(ULONG_PTR*)eval_expression(csw, (const unsigned char*)info->cfa_offset, context); + *cfa = *(ULONG_PTR*)eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); break; case RULE_VAL_EXPRESSION: - *cfa = eval_expression(csw, (const unsigned char*)info->cfa_offset, context); + *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); break; default: *cfa = get_context_reg(context, info->cfa_reg) + info->cfa_offset; @@ -2901,11 +2903,11 @@ static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struc copy_context_reg(&new_context, i, context, info->regs[i]); break; case RULE_EXPRESSION: - value = eval_expression(csw, (const unsigned char*)info->regs[i], context); + value = eval_expression(module, csw, (const unsigned char*)info->regs[i], context); set_context_reg(csw, &new_context, i, value, TRUE); break; case RULE_VAL_EXPRESSION: - value = eval_expression(csw, (const unsigned char*)info->regs[i], context); + value = eval_expression(module, csw, (const unsigned char*)info->regs[i], context); set_context_reg(csw, &new_context, i, value, FALSE); break; } @@ -2973,7 +2975,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk* csw, ULONG_PTR ip, CONTEXT* co if (end) fde_ctx.data = end; execute_cfa_instructions(&fde_ctx, ip, &info); - apply_frame_info(csw, context, &info, cfa); + apply_frame_info(pair.effective, csw, context, &info, cfa); return TRUE; }

1 0

Eric Pouech : winmm: Added a couple of tests for structure alignment.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: e9e6845d66645daff6ffcfe599e03849e6ba9d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e6845d66645daff6ffcfe59… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jun 25 22:06:07 2010 +0200 winmm: Added a couple of tests for structure alignment. --- dlls/winmm/tests/Makefile.in | 1 + dlls/winmm/tests/generated.c | 3504 ++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 122 ++ 3 files changed, 3627 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e6845d66645daff6ffc…

1 0

Tim Cadogan-Cowper : winmm: Correctly calculate dwFileSize for apps installing their own IOproc.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: d65031666179bba2f3bcacbd031ab153e4c7e1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65031666179bba2f3bcacbd0… Author: Tim Cadogan-Cowper <tccowper(a)yahoo.com.au> Date: Sun Jun 27 04:20:04 2010 -0700 winmm: Correctly calculate dwFileSize for apps installing their own IOproc. --- dlls/winmm/mmio.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index f13e090..a6e06b5 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,16 +667,11 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, (LPARAM)szFileName, 0, FALSE); /* grab file size, when possible */ - /* FIXME: the code around dwFileSize is: - * - probably broken - * - needs to be tested when the app installs its own IOproc - * - likely to be removed - * So, restrict dwFileSize usage to DOS ioprocs - */ - if (wm->info.fccIOProc == FOURCC_DOS && (pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1) - { - wm->dwFileSize = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_END); - _llseek((HFILE)wm->info.adwInfo[0], pos, SEEK_SET); + if (wm->info.fccIOProc != FOURCC_MEM && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { + pos = wm->info.lDiskOffset; + send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_END, FALSE); + wm->dwFileSize = wm->info.lDiskOffset; + send_message(wm->ioProc, &wm->info, MMIOM_SEEK, pos, SEEK_SET, FALSE); } else wm->dwFileSize = 0;

1 0

Alexandre Julliard : msvcrt: Use the correct strdup function for locale data.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: c5e88a3a69adf6b2bcd32b070dbf168bc83707d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e88a3a69adf6b2bcd32b070… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 11:45:01 2010 +0200 msvcrt: Use the correct strdup function for locale data. --- dlls/msvcrt/locale.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 393a23d..06c8da1 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -741,7 +741,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) return NULL; } } else - loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = _strdup("C"); if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp; @@ -783,7 +783,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lc_clike = 1; loc->locinfo->mb_cur_max = 1; loc->locinfo->pctype = MSVCRT__ctype+1; - loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = _strdup("C"); } for(i=0; i<256; i++) @@ -988,7 +988,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lconv->p_sign_posn = 127; loc->locinfo->lconv->n_sign_posn = 127; - loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = _strdup("C"); } if(lcid[MSVCRT_LC_NUMERIC] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) { @@ -1055,7 +1055,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lconv->thousands_sep[0] = '\0'; loc->locinfo->lconv->grouping[0] = '\0'; - loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = _strdup("C"); } if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { @@ -1064,7 +1064,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) return NULL; } } else - loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = strdup("C"); + loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = _strdup("C"); return loc; }

1 0

Alexandre Julliard : atl: Fix off-by-one buffer allocation.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: f71c4113bc33fd738ce493d021694f166d2ed27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71c4113bc33fd738ce493d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 28 11:44:40 2010 +0200 atl: Fix off-by-one buffer allocation. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 70c1384..7076e35 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -549,7 +549,7 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, new_rep = HeapAlloc(GetProcessHeap(), 0, sizeof(rep_list)); new_rep->key_len = lstrlenW(Key); - new_rep->key = HeapAlloc(GetProcessHeap(), 0, new_rep->key_len*sizeof(OLECHAR)+1); + new_rep->key = HeapAlloc(GetProcessHeap(), 0, (new_rep->key_len + 1) * sizeof(OLECHAR)); memcpy(new_rep->key, Key, (new_rep->key_len+1)*sizeof(OLECHAR)); len = lstrlenW(item)+1;

1 0

Michael Stefaniuc : start: One language specifier in the English resource is enough.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: b8489d5f33c049e6ea9523bbea26695e8a60b456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8489d5f33c049e6ea9523bbe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 27 22:51:06 2010 +0200 start: One language specifier in the English resource is enough. Also fix a strange indentation. --- programs/start/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/En.rc b/programs/start/En.rc index 463b6c2..3b9fa39 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -23,9 +23,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STRING_USAGE, "Start a program, or open a document in the program normally used for files with that suffix.\n\ +STRING_USAGE, "Start a program, or open a document in the program normally used for files with that suffix.\n\ Usage:\n\ start [options] program_filename [...]\n\ start [options] document_filename\n\

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
67
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 June 2010