December 2011 - Wine-Commits

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

Dec. 22, 2011

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

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

Henri Verbeet : ddraw/tests: Fix a couple of test messages.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: fe4e2bf60e4a111a4c4b78fa868e30ca33f3a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4e2bf60e4a111a4c4b78fa8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 21 21:34:57 2011 +0100 ddraw/tests: Fix a couple of test messages. --- dlls/ddraw/tests/d3d.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e24eb30..fd91c77 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1247,7 +1247,7 @@ static void Direct3D1Test(void) ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1274,7 +1274,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1296,7 +1296,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1315,7 +1315,7 @@ static void Direct3D1Test(void) }; ok(U1(cmpH[i]).hx == U1(outH[i]).hx && U2(cmpH[i]).hy == U2(outH[i]).hy && U3(cmpH[i]).hz == U3(outH[i]).hz && cmpH[i].dwFlags == outH[i].dwFlags, - "HVertex %d differs. Got %08x %f %f %f, expexted %08x %f %f %f\n", i + 1, + "HVertex %d differs. Got %08x %f %f %f, expected %08x %f %f %f\n", i + 1, outH[i].dwFlags, U1(outH[i]).hx, U2(outH[i]).hy, U3(outH[i]).hz, cmpH[i].dwFlags, U1(cmpH[i]).hx, U2(cmpH[i]).hy, U3(cmpH[i]).hz); @@ -1332,7 +1332,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1358,7 +1358,7 @@ static void Direct3D1Test(void) D3DCLIP_LEFT | D3DCLIP_BOTTOM | D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } @@ -1382,7 +1382,7 @@ static void Direct3D1Test(void) D3DCLIP_LEFT | D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } @@ -1407,7 +1407,7 @@ static void Direct3D1Test(void) D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); }

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

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

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

Dec. 22, 2011

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

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

Dec. 22, 2011

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

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

Dec. 22, 2011

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

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

Aric Stewart : usp10: Correct error in EDIT_GetLineRect in index for ScriptStringCPtoX.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 27e3e1a89b01bb91480c047cbf95bcad72f3c5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e3e1a89b01bb91480c047cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 21 09:17:59 2011 -0600 usp10: Correct error in EDIT_GetLineRect in index for ScriptStringCPtoX. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4a54fa0..0fcc9db 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1198,7 +1198,7 @@ static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT pt2 = (ecol == -1) ? es->format_rect.right : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + ecol, TRUE)); if (ssa) { - ScriptStringCPtoX(ssa, line_index + scol, FALSE, &pt3); + ScriptStringCPtoX(ssa, scol, FALSE, &pt3); pt3+=es->format_rect.left; } else pt3 = pt1;

1 0

Piotr Caban : msvcp90: Don' t crash if NULL is passed to _Strcoll and _Wcscoll.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: cd6e9bd14137cdf85a6e867126d87d8523ba3cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6e9bd14137cdf85a6e86712… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:59:50 2011 +0100 msvcp90: Don't crash if NULL is passed to _Strcoll and _Wcscoll. --- dlls/msvcp90/locale.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 582d96f..ad72732 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -34,6 +34,7 @@ char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); +LCID* __cdecl ___lc_handle_func(void); typedef int category; @@ -746,8 +747,15 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, const char *last2, const _Collvec *coll) { + LCID lcid; + TRACE("(%s %s)\n", debugstr_an(first1, last1-first1), debugstr_an(first2, last2-first2)); - return CompareStringA(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2; + + if(coll) + lcid = coll->handle; + else + lcid = ___lc_handle_func()[LC_COLLATE]; + return CompareStringA(lcid, 0, first1, last1-first1, first2, last2-first2)-2; } /* ?do_compare@?$collate(a)D@std@@MBEHPBD000(a)Z */ @@ -992,8 +1000,15 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) { + LCID lcid; + TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2)); - return CompareStringW(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2; + + if(coll) + lcid = coll->handle; + else + lcid = ___lc_handle_func()[LC_COLLATE]; + return CompareStringW(lcid, 0, first1, last1-first1, first2, last2-first2)-2; } /* ?do_compare@?$collate(a)_W@std@@MBEHPB_W000(a)Z */

1 0