December 2011 - Wine-commits

Henri Verbeet : ddraw/tests: Add some tests for DDSCL_CREATEDEVICEWINDOW.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 654d53fa5f44753473e086c7a083cddb57b187b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654d53fa5f44753473e086c7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 21 21:34:58 2011 +0100 ddraw/tests: Add some tests for DDSCL_CREATEDEVICEWINDOW. --- dlls/ddraw/tests/Makefile.in | 2 + dlls/ddraw/tests/ddraw1.c | 130 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 137 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 117 ++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 110 +++++++++++++++++++++++++++++++++- 5 files changed, 489 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=654d53fa5f44753473e08…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DZBUFFERTYPE typedef.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 00096c82fdb9967ffe89a668a0a7a6cc547d59d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00096c82fdb9967ffe89a668a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 21 21:34:59 2011 +0100 wined3d: Get rid of the WINED3DZBUFFERTYPE typedef. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 7 +++---- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/stateblock.c | 4 ++-- include/wine/wined3d.h | 27 +++++++++++++-------------- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d848c82..5d27703 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -329,7 +329,7 @@ extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN; /* Helper functions */ HRESULT IDirect3DImpl_GetCaps(const struct wined3d *wined3d, D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7) DECLSPEC_HIDDEN; -WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) DECLSPEC_HIDDEN; +enum wined3d_depth_buffer_type IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *device) DECLSPEC_HIDDEN; static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *iface) { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d90bf82..85726ef 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6933,8 +6933,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) * The depth stencil state to set if creating the device * *****************************************************************************/ -WINED3DZBUFFERTYPE -IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) +enum wined3d_depth_buffer_type IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) { IDirectDrawSurface7 *depthStencil = NULL; IDirectDrawSurfaceImpl *dsi; @@ -6945,7 +6944,7 @@ IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) { TRACE("Setting wined3d depth stencil to NULL\n"); wined3d_device_set_depth_stencil(This->wined3d_device, NULL); - return WINED3DZB_FALSE; + return WINED3D_ZB_FALSE; } dsi = impl_from_IDirectDrawSurface7(depthStencil); @@ -6953,7 +6952,7 @@ IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) wined3d_device_set_depth_stencil(This->wined3d_device, dsi->wined3d_surface); IDirectDrawSurface7_Release(depthStencil); - return WINED3DZB_TRUE; + return WINED3D_ZB_TRUE; } HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *target) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4f3b74b..950125b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -104,21 +104,21 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ switch (state->render_states[WINED3D_RS_ZENABLE]) { - case WINED3DZB_FALSE: + case WINED3D_ZB_FALSE: glDisable(GL_DEPTH_TEST); checkGLcall("glDisable GL_DEPTH_TEST"); break; - case WINED3DZB_TRUE: + case WINED3D_ZB_TRUE: glEnable(GL_DEPTH_TEST); checkGLcall("glEnable GL_DEPTH_TEST"); break; - case WINED3DZB_USEW: + case WINED3D_ZB_USEW: glEnable(GL_DEPTH_TEST); checkGLcall("glEnable GL_DEPTH_TEST"); FIXME("W buffer is not well handled\n"); break; default: - FIXME("Unrecognized D3DZBUFFERTYPE value %#x.\n", + FIXME("Unrecognized depth buffer type %#x.\n", state->render_states[WINED3D_RS_ZENABLE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c9ee958..fa3a286 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1120,9 +1120,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) TRACE("Render states\n"); /* Render states: */ if (device->auto_depth_stencil) - state->render_states[WINED3D_RS_ZENABLE] = WINED3DZB_TRUE; + state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; else - state->render_states[WINED3D_RS_ZENABLE] = WINED3DZB_FALSE; + state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3DSHADE_GOURAUD; lp.lp.repeat_factor = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2005eaa..d27ef2a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -423,23 +423,22 @@ enum wined3d_vertex_blend_flags enum wined3d_cmp_func { - WINED3D_CMP_NEVER = 1, - WINED3D_CMP_LESS = 2, - WINED3D_CMP_EQUAL = 3, - WINED3D_CMP_LESSEQUAL = 4, - WINED3D_CMP_GREATER = 5, - WINED3D_CMP_NOTEQUAL = 6, - WINED3D_CMP_GREATEREQUAL = 7, - WINED3D_CMP_ALWAYS = 8, + WINED3D_CMP_NEVER = 1, + WINED3D_CMP_LESS = 2, + WINED3D_CMP_EQUAL = 3, + WINED3D_CMP_LESSEQUAL = 4, + WINED3D_CMP_GREATER = 5, + WINED3D_CMP_NOTEQUAL = 6, + WINED3D_CMP_GREATEREQUAL = 7, + WINED3D_CMP_ALWAYS = 8, }; -typedef enum _WINED3DZBUFFERTYPE +enum wined3d_depth_buffer_type { - WINED3DZB_FALSE = 0, - WINED3DZB_TRUE = 1, - WINED3DZB_USEW = 2, - WINED3DZB_FORCE_DWORD = 0x7fffffff -} WINED3DZBUFFERTYPE; + WINED3D_ZB_FALSE = 0, + WINED3D_ZB_TRUE = 1, + WINED3D_ZB_USEW = 2, +}; typedef enum _WINED3DFOGMODE {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DFOGMODE typedef.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 6623a8cfa90a9ecb773714d26105d1f2ad527436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6623a8cfa90a9ecb773714d26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 21 21:35:00 2011 +0100 wined3d: Get rid of the WINED3DFOGMODE typedef. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/shader.c | 18 +++++++++--------- dlls/wined3d/state.c | 31 +++++++++++++++++-------------- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/utils.c | 16 ++++++++-------- include/wine/wined3d.h | 13 ++++++------- 7 files changed, 46 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6623a8cfa90a9ecb77371…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 73e845a810aaff28ec235a65886e805d341a4c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e845a810aaff28ec235a658… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 710550e..8015850 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-16 20:12+0300\n" +"PO-Revision-Date: 2011-12-21 21:04+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3318,24 +3318,20 @@ msgid "Address" msgstr "Adresas" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "%s nustatymai" +msgstr "Ieškoma %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Atsiunčiama iš %s..." +msgstr "Pradedamas %s atsiuntimas" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Atsiunčiama..." +msgstr "Atsiunčiama %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "%s nustatymai" +msgstr "Prašoma %s" #: inetcpl.rc:46 msgid " Home page "

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: adb8d3b7cabdb8ee3c8680b9dd95864f5b120212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb8d3b7cabdb8ee3c8680b9d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 21 20:16:30 2011 +0100 po: Update German translation. --- po/de.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index ffe097c..54fecd6 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-18 13:19+0100\n" +"PO-Revision-Date: 2011-12-21 20:14+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -3314,24 +3314,20 @@ msgid "Address" msgstr "Adresse" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Einstellungen für %s" +msgstr "Suche nach %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Herunterladen von %s..." +msgstr "Herunterladen von %s beginnt" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Lade herunter..." +msgstr "Lade herunter %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Einstellungen für %s" +msgstr "Frage nach %s" #: inetcpl.rc:46 msgid " Home page "

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: b6d5955f228cf7c2df34eded58ec32410e019e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d5955f228cf7c2df34eded5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 23:23:37 2011 +0300 po: Update Russian translation. --- po/ru.po | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/po/ru.po b/po/ru.po index f5cf779..177f6bb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-11 15:50+0300\n" +"PO-Revision-Date: 2011-12-21 23:30+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" @@ -3318,24 +3318,20 @@ msgid "Address" msgstr "Адрес" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Настройки %s" +msgstr "Поиск %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Загрузка с %s..." +msgstr "Начинается загрузка %s" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Загрузка..." +msgstr "Загрузка %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Настройки %s" +msgstr "Запрос %s" #: inetcpl.rc:46 msgid " Home page " @@ -3498,9 +3494,8 @@ msgid "Subscript out of range" msgstr "Индекс вне диапазона" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Ожидается объект" +msgstr "Требуется объект" #: jscript.rc:29 msgid "Automation server can't create object" @@ -3571,9 +3566,8 @@ msgid "Boolean object expected" msgstr "Ожидается объект типа 'bool'" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "Невозможно завершить выполнение\n" +msgstr "Невозможно удалить '|'" #: jscript.rc:47 msgid "VBArray object expected" @@ -6818,7 +6812,6 @@ msgid "&Data Rate" msgstr "&Поток данных" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" msgstr "КБ/сек" @@ -10009,13 +10002,11 @@ msgid "Parameter error\n" msgstr "Неверный параметр\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Том диска %1!c! %2\n" -" Серийный номер %3!04x!-%4!04x!\n" +"Серийный номер тома %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 4d04887da2d9561130a1c227e4e0d44bdc6cfd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d04887da2d9561130a1c227e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 21 21:01:04 2011 +0100 po: Update French translation. --- po/fr.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index 77ccb2d..f68a464 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-15 21:33+0100\n" +"PO-Revision-Date: 2011-12-21 21:00+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3334,24 +3334,20 @@ msgid "Address" msgstr "Adresse" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Propriétés de %s" +msgstr "Recherche de %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Téléchargement depuis %s..." +msgstr "Début du téléchargement de %s" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Téléchargement..." +msgstr "Téléchargement de %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Propriétés de %s" +msgstr "Demande de %s" #: inetcpl.rc:46 msgid " Home page "

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: a9148f43a53cbde510ba348ddc93a26e0c9b5bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9148f43a53cbde510ba348dd… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 21 22:05:58 2011 +0100 po: Update Italian translation. --- po/it.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/it.po b/po/it.po index 6b58491..886b3cd 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-17 08:45+0100\n" +"PO-Revision-Date: 2011-12-21 22:04+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -3327,24 +3327,20 @@ msgid "Address" msgstr "Indirizzo" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Impostazioni di %s" +msgstr "Cercando %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Scaricando da %s..." +msgstr "Cominciando a scaricare %s" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Scaricamento..." +msgstr "Scaricando %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Impostazioni di %s" +msgstr "Richiedendo %s" #: inetcpl.rc:46 msgid " Home page "

1 0

Piotr Caban : msvcp90: Hold _LOCK_LOCALE critical section while _Lockinfo object exists.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: a1db838668820ac899225420f5ec08bf7ee1af2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1db838668820ac899225420f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:50 2011 +0100 msvcp90: Hold _LOCK_LOCALE critical section while _Lockinfo object exists. --- dlls/msvcp90/locale.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8105ca0..95b5407 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -342,7 +342,6 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); else MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); - _Lockit_dtor(&locinfo->lock); return locinfo; } @@ -396,6 +395,7 @@ void __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) MSVCP_basic_string_char_dtor(&locinfo->months); MSVCP_basic_string_char_dtor(&locinfo->oldlocname); MSVCP_basic_string_char_dtor(&locinfo->newlocname); + _Lockit_dtor(&locinfo->lock); } /* ??_F_Locinfo(a)std@@QAEXXZ */ @@ -425,7 +425,6 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con if(!locstr) throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); - _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); MSVCP_basic_string_char_dtor(&locinfo->newlocname); if(category) @@ -437,7 +436,6 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); else MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); - _Lockit_dtor(&locinfo->lock); return locinfo; } @@ -652,7 +650,6 @@ void __thiscall collate_char__Init(collate *this, const _Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(collate_char_ctor_name, 12) collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - _Lockit lockit; _Locinfo locinfo; TRACE("(%p %s %lu)\n", this, name, refs); @@ -660,11 +657,9 @@ collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVC locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_char_vtable; - _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); _Locinfo_ctor_cstr(&locinfo, name); collate_char__Init(this, &locinfo); _Locinfo_dtor(&locinfo); - _Lockit_dtor(&lockit); return this; } @@ -851,7 +846,6 @@ void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_name, 12) collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - _Lockit lockit; _Locinfo locinfo; TRACE("(%p %s %lu)\n", this, name, refs); @@ -859,11 +853,9 @@ collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, MSV locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_wchar_vtable; - _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); _Locinfo_ctor_cstr(&locinfo, name); collate_wchar__Init(this, &locinfo); _Locinfo_dtor(&locinfo); - _Lockit_dtor(&lockit); return this; } @@ -1209,7 +1201,6 @@ DEFINE_THISCALL_WRAPPER(ctype_char_ctor_table, 16) ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, const short *table, MSVCP_bool delete, MSVCP_size_t refs) { - _Lockit lockit; _Locinfo locinfo; TRACE("(%p %p %d %lu)\n", this, table, delete, refs); @@ -1217,11 +1208,9 @@ ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_char_vtable; - _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); _Locinfo_ctor(&locinfo); ctype_char__Init(this, &locinfo); _Locinfo_dtor(&locinfo); - _Lockit_dtor(&lockit); if(table) { ctype_char__Tidy(this);

1 0

Piotr Caban : msvcp90: Added ctype<char>::tolower functions implementation.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 283c07b8ceae3bec3816eaf38581d6fbe37c9434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283c07b8ceae3bec3816eaf38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:59:09 2011 +0100 msvcp90: Added ctype<char>::tolower functions implementation. --- dlls/msvcp90/locale.c | 88 +++++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- 5 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 95b5407..39f01bf 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,12 +26,14 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); +unsigned int __cdecl ___lc_codepage_func(void); typedef int category; @@ -1397,26 +1399,92 @@ const char* __thiscall ctype_char__Widen_s(const ctype_char *this, /* ?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + _Locinfo locinfo; + + *facet = MSVCRT_operator_new(sizeof(ctype_char)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + ctype_char_ctor_locinfo((ctype_char*)*facet, &locinfo, 0); + _Locinfo_dtor(&locinfo); + } + + return LC_CTYPE; +} + +/* _Tolower */ +int __cdecl _Tolower(int ch, const _Ctypevec *ctype) +{ + unsigned int cp; + + TRACE("%d %p\n", ch, ctype); + + if(ctype) + cp = ctype->page; + else + cp = ___lc_codepage_func(); + + /* Don't convert to unicode in case of C locale */ + if(!cp) { + if(ch>='A' && ch<='Z') + ch = ch-'A'+'a'; + return ch; + } else { + WCHAR wide, lower; + char str[2]; + int size; + + if(ch > 255) { + str[0] = (ch>>8) & 255; + str[1] = ch & 255; + size = 2; + } else { + str[0] = ch & 255; + size = 1; + } + + if(!MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, str, size, &wide, 1)) + return ch; + + lower = tolowerW(wide); + if(lower == wide) + return ch; + + WideCharToMultiByte(cp, 0, &lower, 1, str, 2, NULL, NULL); + + return str[0] + (str[1]<<8); + } } /* ?do_tolower@?$ctype(a)D@std@@MBEDD(a)Z */ /* ?do_tolower@?$ctype(a)D@std@@MEBADD(a)Z */ +#define call_ctype_char_do_tolower_ch(this, ch) CALL_VTBL_FUNC(this, 8, \ + char, (const ctype_char*, char), (this, ch)) DEFINE_THISCALL_WRAPPER(ctype_char_do_tolower_ch, 8) char __thiscall ctype_char_do_tolower_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return _Tolower(ch, &this->ctype); } /* ?do_tolower@?$ctype(a)D@std@@MBEPBDPADPBD(a)Z */ /* ?do_tolower@?$ctype(a)D@std@@MEBAPEBDPEADPEBD(a)Z */ +#define call_ctype_char_do_tolower(this, first, last) CALL_VTBL_FUNC(this, 4, \ + const char*, (const ctype_char*, char*, const char*), (this, first, last)) DEFINE_THISCALL_WRAPPER(ctype_char_do_tolower, 12) const char* __thiscall ctype_char_do_tolower(const ctype_char *this, char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + for(; first<last; first++) + *first = _Tolower(*first, &this->ctype); + return last; } /* ?tolower@?$ctype(a)D@std@@QBEDD(a)Z */ @@ -1424,8 +1492,8 @@ const char* __thiscall ctype_char_do_tolower(const ctype_char *this, char *first DEFINE_THISCALL_WRAPPER(ctype_char_tolower_ch, 8) char __thiscall ctype_char_tolower_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return call_ctype_char_do_tolower_ch(this, ch); } /* ?tolower@?$ctype(a)D@std@@QBEPBDPADPBD(a)Z */ @@ -1433,8 +1501,8 @@ char __thiscall ctype_char_tolower_ch(const ctype_char *this, char ch) DEFINE_THISCALL_WRAPPER(ctype_char_tolower, 12) const char* __thiscall ctype_char_tolower(const ctype_char *this, char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + return call_ctype_char_do_tolower(this, first, last); } /* ?do_toupper@?$ctype(a)D@std@@MBEDD(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 63350fc..61567e8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -136,6 +136,7 @@ const rtti_object_locator name ## _rtti = { \ extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; +extern void *vtbl_wrapper_8; extern void *vtbl_wrapper_12; extern void *vtbl_wrapper_16; extern void *vtbl_wrapper_20; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f53b579..b7599ef 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5798,7 +5798,7 @@ @ stub _Stoulx @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm -@ stub _Tolower +@ cdecl _Tolower(long ptr) @ stub _Toupper @ stub _Towlower @ stub _Towupper diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c3a1c4b..60ea424 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_LOCALE_LENGTH 256 MSVCRT__locale_t MSVCRT_locale = NULL; unsigned short *MSVCRT__pctype = NULL; -int MSVCRT___lc_codepage = 0; +unsigned int MSVCRT___lc_codepage = 0; int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; @@ -640,7 +640,7 @@ LCID* CDECL ___lc_handle_func(void) /********************************************************************* * ___lc_codepage_func (MSVCRT.@) */ -int CDECL ___lc_codepage_func(void) +unsigned int CDECL ___lc_codepage_func(void) { return MSVCRT___lc_codepage; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0695e6f..7ea0067 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -218,7 +218,7 @@ extern thread_data_t *msvcrt_get_thread_data(void); LCID MSVCRT_locale_to_LCID(const char *); extern MSVCRT__locale_t MSVCRT_locale; -extern int MSVCRT___lc_codepage; +extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257];

1 0