February 2015 - Wine-Commits

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

Feb. 25, 2015

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(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ */

1 0

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

Feb. 25, 2015

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 Feb. 25, 2015

Feb. 25, 2015

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(a)_Locinfo@std@@QBEHXZ */ /* ?_Getdateorder(a)_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(a)_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

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

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

Henri Verbeet : d3d10core: Implement d3d10_input_layout_SetPrivateDataInterface().
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: e30032a64d6e7c836546e51ededcb8d3c73c0115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30032a64d6e7c836546e51ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:09 2015 +0100 d3d10core: Implement d3d10_input_layout_SetPrivateDataInterface(). --- 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 79ebea3..a559b0b 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -185,9 +185,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&layout->private_store, guid, data); } static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl =

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: 0f12a90e64cd2faaef5acb8213cdac80c8e39227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f12a90e64cd2faaef5acb821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 10:04:29 2015 +0300 po: Update Russian translation. --- po/ru.po | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index d6640e2..9d312e9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2731,11 +2731,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" @@ -3148,8 +3143,6 @@ msgid "&View Source" msgstr "&Открыть исходный текст" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "Сво&йства" @@ -11519,10 +11512,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 "" @@ -11530,10 +11521,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

Nikolay Sivov : services: Pass resume index to server.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: wine Branch: master Commit: c0b0d3b4e25c01cf3ab734882af6b82589e9a53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b0d3b4e25c01cf3ab734882… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 09:07:59 2015 +0300 services: Pass resume index to server. --- dlls/advapi32/service.c | 5 +---- include/wine/svcctl.idl | 5 +++-- programs/services/rpc.c | 8 ++++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e0f7312..ae002c9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1619,9 +1619,6 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, returned, resume_handle); - if (resume_handle) - FIXME("resume handle not supported\n"); - if (!hmngr) { SetLastError( ERROR_INVALID_HANDLE ); @@ -1637,7 +1634,7 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST __TRY { - err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned ); + err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned, resume_handle ); } __EXCEPT(rpc_filter) { diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index b5a8c4d..7409b17 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -253,7 +253,7 @@ typedef struct _SC_RPC_CONFIG_INFOW { /* Not compatible with Windows function 0x0d */ DWORD svcctl_EnumDependentServicesW(/* FIXME */); - /* Not compatible with Windows function 0x0e */ + /* Compatible with Windows function 0x0e */ DWORD svcctl_EnumServicesStatusW( [in] SC_RPC_HANDLE hmngr, [in] DWORD type, @@ -261,7 +261,8 @@ typedef struct _SC_RPC_CONFIG_INFOW { [out,size_is(size)] BYTE *buffer, [in] DWORD size, [out] LPDWORD needed, - [out] LPDWORD returned + [out] LPDWORD returned, + [in,out,unique] LPDWORD resume ); /* Compatible with Windows function 0x0f */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 34d012d..3a206c7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1276,7 +1276,8 @@ DWORD __cdecl svcctl_EnumServicesStatusW( BYTE *buffer, DWORD size, LPDWORD needed, - LPDWORD returned) + LPDWORD returned, + LPDWORD resume) { DWORD err, sz, total_size, num_services; DWORD_PTR offset; @@ -1284,7 +1285,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW( struct service_entry *service; ENUM_SERVICE_STATUSW *s; - WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned); + WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned, resume); if (!type || !state) return ERROR_INVALID_PARAMETER; @@ -1292,6 +1293,9 @@ DWORD __cdecl svcctl_EnumServicesStatusW( if ((err = validate_scm_handle(hmngr, SC_MANAGER_ENUMERATE_SERVICE, &manager)) != ERROR_SUCCESS) return err; + if (resume) + WINE_FIXME("resume index not supported\n"); + scmdatabase_lock_exclusive(manager->db); total_size = num_services = 0;

1 0

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

Feb. 25, 2015

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

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

Feb. 25, 2015

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

Jacek Caban : mshtml: Wine Gecko 2.36 release.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

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