July 2010 - Wine-Commits - list.winehq.org

Davide Pizzetti : winedbg: Italian translation update.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: cf96f89ef0a1e680b01cbc26acb3c423e7641343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf96f89ef0a1e680b01cbc26a… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jul 21 23:25:28 2010 +0200 winedbg: Italian translation update. --- programs/winedbg/rsrc_It.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/rsrc_It.rc b/programs/winedbg/rsrc_It.rc index b74c31c..03c1265 100644 --- a/programs/winedbg/rsrc_It.rc +++ b/programs/winedbg/rsrc_It.rc @@ -40,13 +40,13 @@ FONT 8, "Tahoma" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 LTEXT "Il programma %s ha incontrato un errore e deve \ - chiudersi. Siamo spiacenti per l'inconveniente.", + essere chiuso. Siamo spiacenti per l'inconveniente.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "Questo può essere causato da un problema nel programma o da una mancanza in Wine. \ + LTEXT "Ciò può essere causato da un problema nel programma o da una mancanza di Wine. \ Potresti voler consultare http://appdb.winehq.org per consigli su \ questa applicazione.\n\n\ - Se questo problema non è presente sotto Windows e non è stato ancora riportato, \ - puoi riportarlo su http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + Se questo problema non è presente sotto Windows e non è stato ancora segnalato, \ + puoi segnalarlo su http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 DEFPUSHBUTTON "Chiudi", IDOK, 205, 151, 60, 16, WS_TABSTOP END

1 0

Henri Verbeet : wined3d: Framebuffer blits are affected by the color mask.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 3d8ff7f27a8818d6a89192c56f993d0689a419bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8ff7f27a8818d6a89192c56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:24 2010 +0200 wined3d: Framebuffer blits are affected by the color mask. --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/swapchain.c | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 447aa40..4b87245 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5835,6 +5835,13 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); } + + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 783033c..87db680 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -126,6 +126,12 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(This->device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));

1 0

Davide Pizzetti : winecfg: Italian translation update.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 53db2df4b1513ad0882d9a846a21157dbca2c7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53db2df4b1513ad0882d9a846… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jul 21 23:15:03 2010 +0200 winecfg: Italian translation update. --- programs/winecfg/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index de8f11d..fc0ae91 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -295,7 +295,7 @@ BEGIN IDS_DEVICES_MIDIIN "Dispositivo MIDI In" IDS_DEVICES_AUX "Dispositivo Aux" IDS_DEVICES_MIXER "Dispositivo Mixer" - IDS_UNAVAILABLE_DRIVER "Trovato driver nel registro che non è disponibile!\n\nRimuovere '%s' dal registro?" + IDS_UNAVAILABLE_DRIVER "Trovato driver nel registro non disponibile!\n\nRimuovere '%s' dal registro?" IDS_WARNING "Attenzione" END

1 0

Henri Verbeet : wined3d: Preload resources before FBO setup.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 4817a650911d78dd59baf954a65fcc8df124af1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4817a650911d78dd59baf954a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:23 2010 +0200 wined3d: Preload resources before FBO setup. --- dlls/wined3d/context.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fe397dc..435c315 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2110,6 +2110,14 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp const struct StateEntry *state_table = device->StateTable; unsigned int i; + /* Preload resources before FBO setup. Texture preload in particular may + * result in changes to the current FBO, due to using e.g. FBO blits for + * updating a resource location. */ + IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); + if (isStateDirty(context, STATE_VDECL)) + device_update_stream_info(device, context->gl_info); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { context_validate_onscreen_formats(device, context, device->depth_stencil); @@ -2139,11 +2147,6 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); } - IWineD3DDeviceImpl_FindTexUnitMap(device); - device_preload_textures(device); - if (isStateDirty(context, STATE_VDECL)) - device_update_stream_info(device, context->gl_info); - ENTER_GL(); for (i = 0; i < context->numDirtyEntries; ++i) {

1 0

Paul Vriens : comdlg32: Add the Serbian (Latin) translation.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 03a4c6445794f339ba37a9f1bdecb42fb82cf428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a4c6445794f339ba37a9f1b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 21 23:32:06 2010 +0200 comdlg32: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/comdlg32/Makefile.in | 1 + dlls/comdlg32/cdlg_Sr.rc | 481 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 482 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03a4c6445794f339ba37a…

1 0

Igor Paliychuk : wineconsole: Add Ukrainian translation.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 0a3f093fe4ab2407fa68a224afd85bb33f9fb496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3f093fe4ab2407fa68a224a… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Wed Jul 21 14:55:12 2010 +0300 wineconsole: Add Ukrainian translation. --- programs/wineconsole/Makefile.in | 1 + programs/wineconsole/wineconsole_Uk.rc | 139 ++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index f925a10..74e99a1 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -36,6 +36,7 @@ RC_SRCS = \ wineconsole_Si.rc \ wineconsole_Sv.rc \ wineconsole_Tr.rc \ + wineconsole_Uk.rc \ wineconsole_Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/wineconsole/wineconsole_Uk.rc b/programs/wineconsole/wineconsole_Uk.rc new file mode 100644 index 0000000..47d164e --- /dev/null +++ b/programs/wineconsole/wineconsole_Uk.rc @@ -0,0 +1,139 @@ +/* + * Copyright 2001 Eric Pouech + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wineconsole_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +IDS_EDIT, "Реда&гування" +IDS_DEFAULT, "За &замовчанням" +IDS_PROPERTIES, "&Властивості" +IDS_MARK, "Ві&дзначити" +IDS_COPY, "&Копіювати" +IDS_PASTE, "В&ставити" +IDS_SELECTALL, "Вид&ілити все" +IDS_SCROLL, "Прок&рутити" +IDS_SEARCH, "По&шук" +IDS_FNT_DISPLAY, "Кожен символ має %ld пікселів в ширину і %ld пікселів в висоту" +IDS_FNT_PREVIEW, "Це тест" +IDS_DLG_TIT_DEFAULT, "Налаштування - Станд. параметри" +IDS_DLG_TIT_CURRENT, "Налаштування - Поточні параметри" +IDS_DLG_TIT_ERROR, "Помилка конфігурації" +IDS_DLG_ERR_SBWINSIZE, "Розмір буфера екрану повинен бути не менший буфера вікна" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Невірний код події\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Невірний backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Невідомий параметр командного рядка\n" +IDS_CMD_ABOUT "Запуск програми в консолі Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Запуск програми %s не вдався.\n"\ + "Команда невірна.\n" + +IDS_USAGE_HEADER "\nВикористання:\n wineconsole [параметри] <команда>\n\nПараметри:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Вибір user відкриє нове вікно, curses спробує\n"\ + " налаштувати поточний термінал як консоль Wine\n" +IDS_USAGE_COMMAND " <команда> Назва програми для запуску в консолі Wine\n" +IDS_USAGE_FOOTER "\nПриклад:\n wineconsole cmd\nЗапуск командного рядка Wine в консолі Wine\n\n" + +END + +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Параметри " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Розмір курсора", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "&Малий", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Середній", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Великий", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "Керування", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "Сплив. меню", -1, 79, 23, 44, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 140, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 140, 33, 60, 10, WS_TABSTOP + LTEXT "Швидке редагув.", -1, 79, 43, 58, 10 + AUTOCHECKBOX "вв&імкнути", IDC_OPT_QUICK_EDIT, 140, 43, 60, 10, WS_TABSTOP + + GROUPBOX "Історія команд", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "&Кількість нагаданих команд :", -1, 14, 67, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + AUTOCHECKBOX "Видаляти &повтори", IDC_OPT_HIST_NODOUBLE, 140, 67, 50, 18, WS_TABSTOP|BS_MULTILINE +} + +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Шрифт " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Шрифт", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&Колір", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&Розмір", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 25 +} + +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Конфігурація " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Зона буфера", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "&Ширина :", -1, 14, 25, 54, 9 + EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "&Висота :", -1, 14, 39, 54, 9 + EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Розмір вікна", -1, 10, 55, 100, 42 + LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 + EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "Висо&та :", -1, 14, 83, 54, 9 + EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Завершення програми", -1, 115, 11, 84, 42, BS_GROUPBOX + AUTOCHECKBOX "&Закрити консоль", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + + GROUPBOX "Випуск", -1, 115, 55, 84, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP +} + +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 202, 60 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Параметри консолі" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 10, 10, 182, 31, BS_GROUPBOX + AUTORADIOBUTTON "Зберегти ці налаштування для наступних сесій", IDC_SAV_SAVE, 14, 15, 172, 10, WS_TABSTOP + AUTORADIOBUTTON "Змінювати лише поточну сесію", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + + PUSHBUTTON "OK", IDOK, 55, 45, 40, 12 + PUSHBUTTON "Скасувати", IDCANCEL, 105, 45, 40, 12 +}

1 0

Matteo Bruni : d3dx9: Shader assembler <= ps_1_3 support.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: d567a030ecfbb68f2f61f969040cd837339b136d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d567a030ecfbb68f2f61f9690… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Shader assembler <= ps_1_3 support. --- dlls/d3dx9_36/asmparser.c | 381 ++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/asmshader.y | 12 +- dlls/d3dx9_36/bytecodewriter.c | 314 ++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 10 + dlls/d3dx9_36/tests/asm.c | 46 +++++- 5 files changed, 713 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d567a030ecfbb68f2f61f…

1 0

Matteo Bruni : d3dx9: Fix dst register handling in ps_1_4.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 383a7fe3b12832bee9abae767e433c25ff6ddfc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383a7fe3b12832bee9abae767… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Fix dst register handling in ps_1_4. --- dlls/d3dx9_36/asmparser.c | 2 +- dlls/d3dx9_36/tests/asm.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 10188a0..dfa8362 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -838,7 +838,7 @@ static void asmparser_dstreg_ps_1_4(struct asm_parser *This, debug_print_dstreg(dst)); set_parse_status(This, PARSE_ERR); } - reg = map_oldps_register(dst, FALSE); + reg = map_oldps_register(dst, TRUE); memcpy(&instr->dst, &reg, sizeof(reg)); instr->has_dst = TRUE; } diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index fe3eee0..7d7d211 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -583,11 +583,21 @@ static void ps_1_4_test(void) { "texdepth_x2 r5\n", {0xffff0104, 0x00000057, 0x810f0005, 0x0000ffff} }, - { /* shader 18 */ + { /* shader 19 */ "ps_1_4\n" "bem_d2 r1, c0, r0\n", {0xffff0104, 0x00000059, 0x8f0f0001, 0xa0e40000, 0x80e40000, 0x0000ffff} }, + { /* shader 20 */ + "ps_1_4\n" + "texkill t0\n", + {0xffff0104, 0x00000041, 0xb00f0000, 0x0000ffff} + }, + { /* shader 21 */ + "ps_1_4\n" + "texkill r0\n", + {0xffff0104, 0x00000041, 0x800f0000, 0x0000ffff} + }, }; exec_tests("ps_1_4", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Alexandre Julliard : rpcrt4: Don' t align the buffer after reading the conformance, we need to read the variance first.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: ee5cada23580f4df61c9e88cd209821c43f63865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5cada23580f4df61c9e88cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 20:31:53 2010 +0200 rpcrt4: Don't align the buffer after reading the conformance, we need to read the variance first. --- dlls/rpcrt4/ndr_marshall.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3ad55aa..db8be60 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2062,7 +2062,6 @@ static inline ULONG array_read_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD def, esize; - unsigned char alignment; switch (fc) { @@ -2087,7 +2086,6 @@ static inline ULONG array_read_conformance( ReadConformance(pStubMsg, NULL); return safe_multiply(esize, pStubMsg->MaxCount); case RPC_FC_BOGUS_ARRAY: - alignment = pFormat[1] + 1; def = *(const WORD *)(pFormat + 2); pFormat += 4; if (IsConformanceOrVariancePresent(pFormat)) pFormat = ReadConformance(pStubMsg, pFormat); @@ -2098,7 +2096,6 @@ static inline ULONG array_read_conformance( } pFormat = SkipVariance( pStubMsg, pFormat ); - align_pointer(&pStubMsg->Buffer, alignment); esize = ComplexStructSize(pStubMsg, pFormat); return safe_multiply(pStubMsg->MaxCount, esize); default:

1 0

Matteo Bruni : d3dx9: Add <= ps_1_3 instruction parsing to the shader assembler.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 8ce3ecea0d9f1f999edf1ba369190b355cb9502a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce3ecea0d9f1f999edf1ba36… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Add <= ps_1_3 instruction parsing to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 17 ++++++ dlls/d3dx9_36/asmshader.y | 102 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 30 +++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 15 ++++++ 4 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce3ecea0d9f1f999edf1…

1 0