January 2013 - Wine-commits

Henri Verbeet : d3drm: Avoid LPD3DRMIMAGE.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 33f0e190f25d98ec3c350b569c965c970d3e07cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f0e190f25d98ec3c350b569… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:36 2013 +0100 d3drm: Avoid LPD3DRMIMAGE. --- dlls/d3drm/d3drm.c | 24 ++++++++++++------------ dlls/d3drm/texture.c | 4 ++-- include/d3drm.h | 6 +++--- include/d3drmobj.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 709a2f8..48b362d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -191,14 +191,14 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPD return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM* iface, LPD3DRMIMAGE pImage, - LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_CreateTexture(IDirect3DRM *iface, + D3DRMIMAGE *image, IDirect3DRMTexture **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown**)ppTexture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRMImpl_CreateLight(IDirect3DRM* iface, D3DRMLIGHTTYPE type, @@ -568,14 +568,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2* iface, LPD3DRMIMAGE pImage, - LPDIRECT3DRMTEXTURE2 * ppTexture) +static HRESULT WINAPI IDirect3DRM2Impl_CreateTexture(IDirect3DRM2 *iface, + D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, pImage, ppTexture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown**)ppTexture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRM2Impl_CreateLight(IDirect3DRM2* iface, D3DRMLIGHTTYPE type, @@ -988,14 +988,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimationSet(IDirect3DRM3* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3* iface, LPD3DRMIMAGE Image, - LPDIRECT3DRMTEXTURE3* Texture) +static HRESULT WINAPI IDirect3DRM3Impl_CreateTexture(IDirect3DRM3 *iface, + D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, Image, Texture); + FIXME("(%p/%p)->(%p,%p): partial stub\n", iface, This, image, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)Texture); + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); } static HRESULT WINAPI IDirect3DRM3Impl_CreateLight(IDirect3DRM3* iface, D3DRMLIGHTTYPE type, diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 21ac96b..f72dcaa 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -346,7 +346,7 @@ static D3DCOLOR WINAPI IDirect3DRMTexture2Impl_GetDecalTransparentColor(IDirect3 } /*** IDirect3DRMTexture2 methods ***/ -static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2* iface, LPD3DRMIMAGE image) +static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2 *iface, D3DRMIMAGE *image) { IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface); @@ -722,7 +722,7 @@ static D3DCOLOR WINAPI IDirect3DRMTexture3Impl_GetDecalTransparentColor(IDirect3 return 0; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3* iface, LPD3DRMIMAGE image) +static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3 *iface, D3DRMIMAGE *image) { IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 8311759..93330d8 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -64,7 +64,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; @@ -200,7 +200,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE2 *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; @@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; - STDMETHOD(CreateTexture)(THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE3 *) PURE; + STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7c7a913..14f8a7e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3327,7 +3327,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; /*** IDirect3DRMTexture2 methods ***/ - STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE; + STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; }; @@ -3450,7 +3450,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD_(DWORD, GetDecalScale)(THIS) PURE; STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; - STDMETHOD(InitFromImage)(THIS_ LPD3DRMIMAGE) PURE; + STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; STDMETHOD(GetSurface)(THIS_ DWORD flags, IDirectDrawSurface **surface) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMMATERIALOVERRIDE.
by Alexandre Julliard 28 Jan '13

28 Jan '13

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

Henri Verbeet : wined3d: Introduce a format flag for texturing.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 7c8dab24e6a2326b9572f3a014cc1766aa6ed5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8dab24e6a2326b9572f3a01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:38 2013 +0100 wined3d: Introduce a format flag for texturing. --- dlls/wined3d/directx.c | 266 +--------------------------------------- dlls/wined3d/utils.c | 257 +++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 184 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c8dab24e6a2326b9572f…

1 0

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

25 Jan '13

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

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

25 Jan '13

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

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

25 Jan '13

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 : msvcrt: Fixed setlocale tests on Win8.
by Alexandre Julliard 25 Jan '13

25 Jan '13

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

Piotr Caban : msvcrt: Fixed _Gettnames test on Win8.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 97782484414ff5a32b26c8bcaccd22cc6b8bc2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=97782484414ff5a32b26c8bca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 15:07:37 2013 +0100 msvcrt: Fixed _Gettnames test on Win8. --- dlls/msvcrt/tests/locale.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 3bb7fdc..257e3c8 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -656,6 +656,7 @@ static void test__Gettnames(void) char data[1]; } *ret; int size; + char buf[64]; if(!setlocale(LC_ALL, "english")) return; @@ -712,7 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, MMMM dd, yyyy"), "ret->str[41] = %s\n", ret->str[41]); + ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, + buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret); if(!setlocale(LC_TIME, "german"))

1 0

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

25 Jan '13

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 : jscript: Fixed a leak in do_regexp_match_next function.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 1548d0ef7b9a029fc35cb58cba3abb2906ea7894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1548d0ef7b9a029fc35cb58cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 16:47:57 2013 +0100 jscript: Fixed a leak in do_regexp_match_next function. --- dlls/jscript/regexp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 4d29390..a06550d 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3708,8 +3708,10 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig TRACE("\n"); hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &parens, &parens_cnt, &b); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(parens); return hres; + } if(r) { if(b) { @@ -3931,8 +3933,10 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval const WCHAR *cp = str->str; hres = regexp_match_next(ctx, &regexp->dispex, 0, str, &cp, &parens, &parens_size, &parens_cnt, &match); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(parens); return hres; + } if(r) { if(hres == S_OK) {

1 0