wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Piotr Caban : msvcp90: Added time_get<char>::do_date_order implementation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 69ed143be6580ba4a50a37f1baad5f6f23bf9600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ed143be6580ba4a50a37f1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:34:10 2015 +0100 msvcp90: Added time_get<char>::do_date_order implementation. --- dlls/msvcp90/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5237e09..397d8c5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9471,8 +9471,8 @@ DEFINE_THISCALL_WRAPPER(time_get_char_do_date_order, 4) /* virtual */ #endif dateorder __thiscall time_get_char_do_date_order(const time_get_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->dateorder; } /* ?date_order@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ */

1 0

Piotr Caban : msvcp90: Added time_get<char> class stub.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 6c09dc7a9970605aafcf338a91b822b3b90e953b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c09dc7a9970605aafcf338a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:34:03 2015 +0100 msvcp90: Added time_get<char> class stub. --- dlls/msvcp90/locale.c | 363 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 88 +++++------ 2 files changed, 407 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c09dc7a9970605aafcf3…

1 0

Piotr Caban : msvcp: Added _Getdateorder implementation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: b0f8a2b85f1ef8989d77b66e54433009fab53847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f8a2b85f1ef8989d77b66e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:33:52 2015 +0100 msvcp: Added _Getdateorder implementation. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 26 ++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 2 +- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 0055d79..bafbf18 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2912,7 +2912,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a2c5ac9..6548146 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3781,7 +3781,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 653b742..30071ab 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3724,7 +3724,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 390d470..61ba791 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3724,7 +3724,7 @@ @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype @ cdecl -ret64 _Getcvt() msvcp120._Getcvt -@ stub _Getdateorder +@ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes @ extern _Hugeval msvcp120._Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 8f3c43e..ed18b59 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5727,7 +5727,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a0fbc66..95f4e8d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -38,6 +38,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +typedef enum { + DATEORDER_no_order, + DATEORDER_dmy, + DATEORDER_mdy, + DATEORDER_ymd, + DATEORDER_ydm +} dateorder; + char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); @@ -689,13 +697,27 @@ _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) return ret; } +int __cdecl _Getdateorder(void) +{ + WCHAR date_fmt[2]; + + if(!GetLocaleInfoW(___lc_handle_func()[LC_TIME], LOCALE_ILDATE, + date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + return DATEORDER_no_order; + + if(*date_fmt == '0') return DATEORDER_mdy; + if(*date_fmt == '1') return DATEORDER_dmy; + if(*date_fmt == '2') return DATEORDER_ymd; + return DATEORDER_no_order; +} + /* ?_Getdateorder@_Locinfo@std@@QBEHXZ */ /* ?_Getdateorder@_Locinfo@std@@QEBAHXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getdateorder, 4) int __thiscall _Locinfo__Getdateorder(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return _Getdateorder(); } /* ?_Getdays@_Locinfo@std@@QBEPBDXZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 925a153..0e5c842 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6499,7 +6499,7 @@ @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -ret64 _Getcvt() -@ stub _Getdateorder +@ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval

1 0

Jacek Caban : mshtml: Wine Gecko 2.36 release.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 20080c616de9d410f33cc2bbafc329b42d49fc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20080c616de9d410f33cc2bba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 24 14:19:41 2015 +0100 mshtml: Wine Gecko 2.36 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/nsiface.idl | 139 +++++++++++++++++++++-------------------------- dlls/mshtml/nsio.c | 89 +++++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20080c616de9d410f33cc…

1 0

Jacek Caban : mshtml: Correctly handle S_OK with NULL URL return from TranslateUrl.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 203c47e60470812dce2d619bb856a61d9cc2a535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203c47e60470812dce2d619bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 12:59:20 2015 +0100 mshtml: Correctly handle S_OK with NULL URL return from TranslateUrl. --- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/tests/htmldoc.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c2d4603..39e2733 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2324,7 +2324,7 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, display_uri, &translated_url); - if(hres == S_OK) { + if(hres == S_OK && translated_url) { TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url)); SysFreeString(display_uri); hres = create_uri(translated_url, 0, &uri); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3b332d1..33f4696 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2614,6 +2614,12 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D ok(ppchURLOut != NULL, "ppchURLOut == NULL\n"); ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut); + /* Not related to hash navigation, just return NULL and S_OK in some cases. */ + if(loading_hash) { + *ppchURLOut = NULL; + return S_OK; + } + return S_FALSE; }

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 0200ee838d7e78953a7cfad5fe57e1f705555c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0200ee838d7e78953a7cfad5f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 25 11:46:33 2015 +0200 po: Update Ukrainian translation. --- po/uk.po | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/po/uk.po b/po/uk.po index 37d9a08..dd47944 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2730,11 +2730,6 @@ msgstr "" "Ви дійсно хочете видалити цей сертифікат?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3146,8 +3141,6 @@ msgid "&View Source" msgstr "&Переглянути вихідний код" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "Властивості" @@ -11601,10 +11594,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Помилка: неправильні параметри командного рядка\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Помилка: неможливо додати ключі на віддаленій машині\n" +msgstr "Помилка: неможливо отримати доступ до віддаленої машини\n" #: reg.rc:38 msgid "" @@ -11612,10 +11603,8 @@ msgid "" msgstr "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Помилка: Непідтримуваний тип\n" #: regedit.rc:34 msgid "&Registry"

1 0

Michael Stefaniuc : riched20: Remove no-op addition with 0 (PVS-Studio).
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: f40b4291d45e73994d975b75db8cc983bb41c464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40b4291d45e73994d975b75d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 25 10:36:51 2015 +0100 riched20: Remove no-op addition with 0 (PVS-Studio). --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7632d47..4da2369 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1870,7 +1870,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH if (nCurEnd == 0) { ME_PrevRun(&pCurPara, &pCurItem); - nCurEnd = pCurItem->member.run.len + nMatched; + nCurEnd = pCurItem->member.run.len; } while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ),

1 0

Matteo Bruni : wined3d: Use the core version of the INCR_WRAP and DECR_WRAP tokens.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: aca8ab91ebe93ae1c3f7c3e49714301615293066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca8ab91ebe93ae1c3f7c3e49… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:17 2015 +0100 wined3d: Use the core version of the INCR_WRAP and DECR_WRAP tokens. --- dlls/wined3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 961f651..ccfe667 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -786,9 +786,9 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) case WINED3D_STENCIL_OP_INVERT: return GL_INVERT; case WINED3D_STENCIL_OP_INCR: - return GL_INCR_WRAP_EXT; + return GL_INCR_WRAP; case WINED3D_STENCIL_OP_DECR: - return GL_DECR_WRAP_EXT; + return GL_DECR_WRAP; default: FIXME("Unrecognized stencil op %#x.\n", op); return GL_KEEP;

1 0

Matteo Bruni : d3d8/tests: Move a Present out of the loops in fog_with_shader_test().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 04fa54fc440b6dd2b555cd6518f2859ef579d315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fa54fc440b6dd2b555cd651… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:16 2015 +0100 d3d8/tests: Move a Present out of the loops in fog_with_shader_test(). --- dlls/d3d8/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 85b3fad..a0f5971 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1000,10 +1000,9 @@ static void fog_with_shader_test(void) "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); - - IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); } } + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[1]); IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[2]);

1 0

Henri Verbeet : d3d10core: Implement d3d10_input_layout_GetPrivateData().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 7c8f053880ecb2c6ba42ae54520e759d0343d7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8f053880ecb2c6ba42ae545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:10 2015 +0100 d3d10core: Implement d3d10_input_layout_GetPrivateData(). --- dlls/d3d10core/inputlayout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index a559b0b..bb3e4c5 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -165,10 +165,12 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface,

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
42
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 February 2015