January 2013 - Wine-Commits

Henri Verbeet : d3drm: Avoid LPD3DRMMATERIALOVERRIDE.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 740c44f5ff759cbcd8d6ac6521b072357facadcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=740c44f5ff759cbcd8d6ac652… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:37 2013 +0100 d3drm: Avoid LPD3DRMMATERIALOVERRIDE. --- dlls/d3drm/frame.c | 8 ++++---- include/d3drmobj.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 03f0184..525a3fa 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2531,8 +2531,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetSceneFogMethod(IDirect3DRMFrame3* return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_SetMaterialOverride(IDirect3DRMFrame3* iface, - LPD3DRMMATERIALOVERRIDE override) +static HRESULT WINAPI IDirect3DRMFrame3Impl_SetMaterialOverride(IDirect3DRMFrame3 *iface, + D3DRMMATERIALOVERRIDE *override) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); @@ -2541,8 +2541,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetMaterialOverride(IDirect3DRMFrame return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetMaterialOverride(IDirect3DRMFrame3* iface, - LPD3DRMMATERIALOVERRIDE override) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetMaterialOverride(IDirect3DRMFrame3 *iface, + D3DRMMATERIALOVERRIDE *override) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 14f8a7e..47e4d48 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1691,8 +1691,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(GetTraversalOptions)(THIS_ LPDWORD pFlags) PURE; STDMETHOD(SetSceneFogMethod)(THIS_ DWORD flags) PURE; STDMETHOD(GetSceneFogMethod)(THIS_ LPDWORD pFlags) PURE; - STDMETHOD(SetMaterialOverride)(THIS_ LPD3DRMMATERIALOVERRIDE) PURE; - STDMETHOD(GetMaterialOverride)(THIS_ LPD3DRMMATERIALOVERRIDE) PURE; + STDMETHOD(SetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE; + STDMETHOD(GetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE; }; #undef INTERFACE

1 0

Michael Stefaniuc : d3dcompiler_43: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: b5d4c20bfe2ae62b3204bd42c3262854a0ba5a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d4c20bfe2ae62b3204bd42c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 27 22:55:33 2013 +0100 d3dcompiler_43: Use assignment instead of memcpy to copy structs. --- dlls/d3dcompiler_43/asmparser.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index b929c08..c57343f 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -782,7 +782,7 @@ static void asmparser_srcreg_vs_1(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldvs_register(src); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type vs_2_reg_allowed[] = { @@ -816,7 +816,7 @@ static void asmparser_srcreg_vs_2(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldvs_register(src); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type vs_3_reg_allowed[] = { @@ -845,7 +845,7 @@ static void asmparser_srcreg_vs_3(struct asm_parser *This, } check_loop_swizzle(This, src); check_legacy_srcmod(This, src->srcmod); - memcpy(&instr->src[num], src, sizeof(*src)); + instr->src[num] = *src; } static const struct allowed_reg_type ps_1_0123_reg_allowed[] = { @@ -869,7 +869,7 @@ static void asmparser_srcreg_ps_1_0123(struct asm_parser *This, } check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, FALSE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_1_4_reg_allowed[] = { @@ -893,7 +893,7 @@ static void asmparser_srcreg_ps_1_4(struct asm_parser *This, } check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, TRUE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_2_0_reg_allowed[] = { @@ -923,7 +923,7 @@ static void asmparser_srcreg_ps_2(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, TRUE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_2_x_reg_allowed[] = { @@ -955,7 +955,7 @@ static void asmparser_srcreg_ps_2_x(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, TRUE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_3_reg_allowed[] = { @@ -985,7 +985,7 @@ static void asmparser_srcreg_ps_3(struct asm_parser *This, } check_loop_swizzle(This, src); check_legacy_srcmod(This, src->srcmod); - memcpy(&instr->src[num], src, sizeof(*src)); + instr->src[num] = *src; } static void asmparser_dstreg_vs_1(struct asm_parser *This, @@ -1002,7 +1002,7 @@ static void asmparser_dstreg_vs_1(struct asm_parser *This, check_ps_dstmod(This, instr->dstmod); check_shift_dstmod(This, instr->shift); reg = map_oldvs_register(dst); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1020,7 +1020,7 @@ static void asmparser_dstreg_vs_2(struct asm_parser *This, check_ps_dstmod(This, instr->dstmod); check_shift_dstmod(This, instr->shift); reg = map_oldvs_register(dst); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1035,7 +1035,7 @@ static void asmparser_dstreg_vs_3(struct asm_parser *This, } check_ps_dstmod(This, instr->dstmod); check_shift_dstmod(This, instr->shift); - memcpy(&instr->dst, dst, sizeof(*dst)); + instr->dst = *dst; instr->has_dst = TRUE; } @@ -1051,7 +1051,7 @@ static void asmparser_dstreg_ps_1_0123(struct asm_parser *This, set_parse_status(&This->status, PARSE_ERR); } reg = map_oldps_register(dst, FALSE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1067,7 +1067,7 @@ static void asmparser_dstreg_ps_1_4(struct asm_parser *This, set_parse_status(&This->status, PARSE_ERR); } reg = map_oldps_register(dst, TRUE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1084,7 +1084,7 @@ static void asmparser_dstreg_ps_2(struct asm_parser *This, } check_shift_dstmod(This, instr->shift); reg = map_oldps_register(dst, TRUE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1101,7 +1101,7 @@ static void asmparser_dstreg_ps_2_x(struct asm_parser *This, } check_shift_dstmod(This, instr->shift); reg = map_oldps_register(dst, TRUE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1115,7 +1115,7 @@ static void asmparser_dstreg_ps_3(struct asm_parser *This, set_parse_status(&This->status, PARSE_ERR); } check_shift_dstmod(This, instr->shift); - memcpy(&instr->dst, dst, sizeof(*dst)); + instr->dst = *dst; instr->has_dst = TRUE; } @@ -1125,7 +1125,7 @@ static void asmparser_predicate_supported(struct asm_parser *This, if(!This->shader) return; if(This->shader->num_instrs == 0) ERR("Predicate without an instruction\n"); This->shader->instr[This->shader->num_instrs - 1]->has_predicate = TRUE; - memcpy(&This->shader->instr[This->shader->num_instrs - 1]->predicate, predicate, sizeof(*predicate)); + This->shader->instr[This->shader->num_instrs - 1]->predicate = *predicate; } static void asmparser_predicate_unsupported(struct asm_parser *This,

1 0

Ken Thomases : winemac: Implement a WINDOW_GOT_FOCUS event for when Cocoa tries to focus a window.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 7863a230ec8412506d3256c20a1940d9bddb9776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7863a230ec8412506d3256c20… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:48 2013 -0600 winemac: Implement a WINDOW_GOT_FOCUS event for when Cocoa tries to focus a window. --- dlls/winemac.drv/cocoa_app.h | 5 +++ dlls/winemac.drv/cocoa_app.m | 70 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_event.m | 7 ++++ dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 32 +++++++++++++++++- dlls/winemac.drv/event.c | 5 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++++ dlls/winemac.drv/window.c | 34 +++++++++++++++++++ 9 files changed, 162 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7863a230ec8412506d325…

1 0

Hans Leidekker : wbemprox: Implement IWbemQualifierSet::Get.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 236b4dae4ace5fe5c994646dafa8d15ff5c940e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236b4dae4ace5fe5c994646da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 17:34:00 2013 +0100 wbemprox: Implement IWbemQualifierSet::Get. --- dlls/wbemprox/builtin.c | 53 +++++++++++++++++++-- dlls/wbemprox/class.c | 7 ++- dlls/wbemprox/qualifier.c | 99 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/tests/query.c | 43 ++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 2 +- 5 files changed, 194 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=236b4dae4ace5fe5c9946…

1 0

Aric Stewart : usp10: Do not apply SSA_LINK to right to left text.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 6c4f35f34586cb015e4e7d6763cd2cd894495569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4f35f34586cb015e4e7d676… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 25 09:12:05 2013 -0600 usp10: Do not apply SSA_LINK to right to left text. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 23ba4f5..e2e72fc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1935,7 +1935,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) analysis->pItem[i].a.fNoGlyphIndex = TRUE; - if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex && !analysis->pItem[i].a.fRTL) analysis->pItem[i].a.fNoGlyphIndex = TRUE; hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos],

1 0

Piotr Caban : msvcrt: Added N flag support to fopen.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 7654d95462cb1c1d921d0344144f5a9c50d9af3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7654d95462cb1c1d921d03441… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 11:39:05 2013 +0100 msvcrt: Added N flag support to fopen. --- dlls/msvcrt/file.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ccfff83..d80a99a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1312,6 +1312,9 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case 'n': *stream_flags &= ~MSVCRT__IOCOMMIT; break; + case 'N': + *open_flags |= MSVCRT__O_NOINHERIT; + break; case '+': case ' ': case 'a':

1 0

Piotr Caban : msvcrt: Ignore S and R flags in fopen.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: ab4b4d34c3245821bae35de7d22ac24dfab35f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4b4d34c3245821bae35de7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 11:38:48 2013 +0100 msvcrt: Ignore S and R flags in fopen. --- dlls/msvcrt/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8a63b51..ccfff83 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1317,6 +1317,10 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case 'a': case 'w': break; + case 'S': + case 'R': + FIXME("ignoring cache optimization flag: %c\n", mode[-1]); + break; default: MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); return -1;

1 0

Huw Davies : riched20: Simplify adding the undo items when joining paragraphs.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: ca46d22bca76d48cae00a0292eeab0988a02be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca46d22bca76d48cae00a0292… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 25 13:56:29 2013 +0000 riched20: Simplify adding the undo items when joining paragraphs. --- dlls/riched20/para.c | 79 ++++++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ffa816d..cef364e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -322,7 +322,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, BOOL keepFirstParaFormat) { - ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp; + ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp, *pCell = NULL; int i, shift; ME_UndoItem *undo = NULL; int end_len; @@ -353,20 +353,6 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_PrevRun(&startCur.pPara, &startCur.pRun); ME_SetCharFormat(editor, &startCur, &endCur, &fmt); - undo = ME_AddUndoItem(editor, diUndoSplitParagraph, pNext); - if (undo) - { - undo->nStart = pNext->member.para.nCharOfs - end_len; - undo->eol_str = pRun->member.run.strText; - pRun->member.run.strText = NULL; /* Avoid freeing the string */ - } - if (!keepFirstParaFormat) - { - ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); - *tp->member.para.pFmt = *pNext->member.para.pFmt; - tp->member.para.border = pNext->member.para.border; - } - if (!editor->bEmulateVersion10) { /* v4.1 */ /* Table cell/row properties are always moved over from the removed para. */ tp->member.para.nFlags = pNext->member.para.nFlags; @@ -374,35 +360,54 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, /* Remove cell boundary if it is between the end paragraph run and the next * paragraph display item. */ - pTmp = pRun->next; - while (pTmp != pNext) { + for (pTmp = pRun->next; pTmp != pNext; pTmp = pTmp->next) + { if (pTmp->type == diCell) { - ME_Cell *pCell = &pTmp->member.cell; - if (undo) - { - assert(!(undo->di.member.para.nFlags & MEPF_ROWEND)); - if (!(undo->di.member.para.nFlags & MEPF_ROWSTART)) - undo->di.member.para.nFlags |= MEPF_CELL; - undo->di.member.para.pCell = ALLOC_OBJ(ME_DisplayItem); - *undo->di.member.para.pCell = *pTmp; - undo->di.member.para.pCell->next = NULL; - undo->di.member.para.pCell->prev = NULL; - undo->di.member.para.pCell->member.cell.next_cell = NULL; - undo->di.member.para.pCell->member.cell.prev_cell = NULL; - } - ME_Remove(pTmp); - if (pCell->prev_cell) - pCell->prev_cell->member.cell.next_cell = pCell->next_cell; - if (pCell->next_cell) - pCell->next_cell->member.cell.prev_cell = pCell->prev_cell; - ME_DestroyDisplayItem(pTmp); + pCell = pTmp; break; } - pTmp = pTmp->next; } } + undo = ME_AddUndoItem(editor, diUndoSplitParagraph, pNext); + if (undo) + { + undo->nStart = pNext->member.para.nCharOfs - end_len; + undo->eol_str = pRun->member.run.strText; + pRun->member.run.strText = NULL; /* Avoid freeing the string */ + + if (pCell) + { + assert(!(undo->di.member.para.nFlags & MEPF_ROWEND)); + if (!(undo->di.member.para.nFlags & MEPF_ROWSTART)) + undo->di.member.para.nFlags |= MEPF_CELL; + undo->di.member.para.pCell = ALLOC_OBJ(ME_DisplayItem); + *undo->di.member.para.pCell = *pCell; + undo->di.member.para.pCell->next = NULL; + undo->di.member.para.pCell->prev = NULL; + undo->di.member.para.pCell->member.cell.next_cell = NULL; + undo->di.member.para.pCell->member.cell.prev_cell = NULL; + } + } + + if (pCell) + { + ME_Remove( pCell ); + if (pCell->member.cell.prev_cell) + pCell->member.cell.prev_cell->member.cell.next_cell = pCell->member.cell.next_cell; + if (pCell->member.cell.next_cell) + pCell->member.cell.next_cell->member.cell.prev_cell = pCell->member.cell.prev_cell; + ME_DestroyDisplayItem( pCell ); + } + + if (!keepFirstParaFormat) + { + ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); + *tp->member.para.pFmt = *pNext->member.para.pFmt; + tp->member.para.border = pNext->member.para.border; + } + shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; pFirstRunInNext = ME_FindItemFwd(pNext, diRunOrParagraph);

1 0

Piotr Caban : jscript: Fixed a leak in regexp_match function.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: c45c7bf94cb41f30149f2e81d72bbe3f4e6096c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45c7bf94cb41f30149f2e81d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 16:48:07 2013 +0100 jscript: Fixed a leak in regexp_match function. --- dlls/jscript/regexp.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index a06550d..65ddc24 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3464,10 +3464,15 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B break; if(ret_size == i) { - if(ret) - ret = heap_realloc(ret, (ret_size <<= 1) * sizeof(match_result_t)); - else + if(ret) { + match_result_t *old_ret = ret; + + ret = heap_realloc(old_ret, (ret_size <<= 1) * sizeof(match_result_t)); + if(!ret) + heap_free(old_ret); + }else { ret = heap_alloc((ret_size=4) * sizeof(match_result_t)); + } if(!ret) { hres = E_OUTOFMEMORY; break;

1 0

Piotr Caban : msvcrt: Fixed setlocale tests on Win8.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 8304bf4dfce272cf350a19f7b4eff2998f8f6305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8304bf4dfce272cf350a19f7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 15:07:16 2013 +0100 msvcrt: Fixed setlocale tests on Win8. --- dlls/msvcrt/tests/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index fba2462..3bb7fdc 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -116,12 +116,14 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-simplified"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); @@ -135,6 +137,7 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "cht");

1 0