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

Yaron Shahrabani : notepad: Add Persian translation.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 77adf2a104a3bb1cf845026c3ae9fe6541fd80c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77adf2a104a3bb1cf845026c3… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Jul 27 23:32:13 2010 +0300 notepad: Add Persian translation. --- programs/notepad/Fa.rc | 131 ++++++++++++++++++++++++++++++++++++++++++ programs/notepad/Makefile.in | 1 + 2 files changed, 132 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Fa.rc b/programs/notepad/Fa.rc new file mode 100644 index 0000000..3fe0f6f --- /dev/null +++ b/programs/notepad/Fa.rc @@ -0,0 +1,131 @@ +/* + * Notepad (Persian resources) + * + * Copyright 2010 Bersam Karbasion <bersam.k(a)gmail.com> + * + * 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 "notepad_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PERSIAN, SUBLANG_PERSIAN_IRAN + +MAIN_MENU MENU +{ + POPUP "&پرونده" { + MENUITEM "&ایجاد‌کردن\tCtrl+N", CMD_NEW + MENUITEM "&باز‌کردن...\tCtrl+O", CMD_OPEN + MENUITEM "&ذخیره\tCtrl+S", CMD_SAVE + MENUITEM "ذخیره &به نام...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&چاپ‌کردن...\tCtrl+P", CMD_PRINT + MENUITEM "تنظیمات &صفحه...", CMD_PAGE_SETUP + MENUITEM "&تنظیمات چاپ‌گر...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&خروج", CMD_EXIT + } +POPUP "&ویرایش" { + MENUITEM "&واگردانی\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&برش\tCtrl+X", CMD_CUT + MENUITEM "&نسخه‌برداری\tCtrl+C", CMD_COPY + MENUITEM "&چسباندن\tCtrl+V", CMD_PASTE + MENUITEM "&حذف\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "انتخاب &همه\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&زمان/تاریخ\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&پیچش سطر‌های بلند", CMD_WRAP + MENUITEM "&قلم‌ها...", CMD_FONT + } +POPUP "&جست‌و‌جو" { + MENUITEM "&جست‌و‌جو...\tCtrl+F", CMD_SEARCH + MENUITEM "جست‌و‌جوی &بعدی\tF3", CMD_SEARCH_NEXT + MENUITEM "جای&‌گزین کردن...\tCtrl+H", CMD_REPLACE + } +POPUP "&کمک" { + MENUITEM "&محتویات", CMD_HELP_CONTENTS + MENUITEM "&جست‌و‌جو...", CMD_HELP_SEARCH + MENUITEM "&کمک برای کمک", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&درباره نت‌پد", CMD_HELP_ABOUT_NOTEPAD + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "تنظیمات صفحه" +{ +LTEXT "&سرصفحه:", 0x140, 10, 07, 40, 15 +EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&پاصفحه:", 0x142, 10, 24, 40, 15 +EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&حاشیه‌ها (میلی‌متر):", 0x144, 10, 43,160, 45 +LTEXT "&چپ:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&بالا:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&راست:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&پایین:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "قبول", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "انصراف", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&کمک", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "کدگذاری:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&f" +STRING_PAGESETUP_FOOTERVALUE, "صفحه &p" + +STRING_NOTEPAD, "نت‌پد" +STRING_ERROR, "خطا" +STRING_WARNING, "اخطار" +STRING_INFO, "اطلاعات" + +STRING_UNTITLED, "نام‌گذاری نشده" + +STRING_ALL_FILES, "همه‌ی پرونده‌ها (*.*)" +STRING_TEXT_FILES_TXT, "پرونده‌های متنی (*.txt)" + +STRING_TOOLARGE, "پرونده '%s' برای نت‌پد خیلی بزرگ است.\n\لطفا از یک ویرایش‌گر دیگر استفاده کنید." +STRING_NOTEXT, "شما هیچ متنی را وارد نکرده‌اید.\\nلطفا یک متن را وارد کرده و دوباره امتحان کنید." +STRING_DOESNOTEXIST, "پرونده‌ای با نام '%s' وجود ندارد.\n\n\آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟" +STRING_NOTSAVED, "پرونده '%s' تغییر يافته‌است.\n\n\آیا می‌خواهید که تغییرات را ذخیره کنید ؟" +STRING_NOTFOUND, "'%s' پیدا نشد." +STRING_OUT_OF_MEMORY, "حافظه‌ی موقت برای انجام این کار وجود ندارد. \ +\nیک یا چند ابزار و برنامه‌ی دیگر را ببندید تا مقدار آزاد حافظه‌ی موقت را افزایش دهید." + +STRING_UNICODE_LE, "یونی‌کد (UTF-16)" +STRING_UNICODE_BE, "یونی‌کد (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\این پرونده دارای کاراکتر‌های یونی‌کد است که اگر آن ها را\n\در کد‌گذاری %s ذخیره کنید ، از دست می روند.\n\برای نگه‌داری این کاراکتر ها ، بر روی انصراف کلیک کنید و سپس\n\یکی از گزینه‌های یونی‌کد زیر را انتخاب کنید.\n\ادامه می‌دهید؟" +} diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index a5bf841..e9b389e 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -22,6 +22,7 @@ RC_SRCS = \ En.rc \ Eo.rc \ Es.rc \ + Fa.rc \ Fi.rc \ Fr.rc \ He.rc \

1 0

Francois Gouget : wine.inf: Let winebrowser handle the ftp URLs.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 0c7ead578ecd264e2559b5e6ecf964249122b71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ead578ecd264e2559b5e6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 28 09:46:13 2010 +0200 wine.inf: Let winebrowser handle the ftp URLs. --- tools/wine.inf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8612f22..213b56f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -206,6 +206,11 @@ HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,ftp\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,ftp\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,ftp\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,ftp\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,ftp\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,http\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,""

1 0

Dmitry Timoshkov : gdi32: Make sure that all the glyph metrics are transformed before caching them.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 213d84be157398dea1fb70782f6bf7decd4d452a URL: http://source.winehq.org/git/wine.git/?a=commit;h=213d84be157398dea1fb70782… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 28 17:07:09 2010 +0900 gdi32: Make sure that all the glyph metrics are transformed before caching them. --- dlls/gdi32/freetype.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9d88211..532278c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4704,14 +4704,11 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } - left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; - right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; - - adv = (INT)((ft_face->glyph->metrics.horiAdvance) + 63) >> 6; - lsb = left >> 6; - bbx = (right - left) >> 6; - if(!needsTransform) { + left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; + right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; + adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - ft_face->glyph->metrics.height) & -64; @@ -4720,6 +4717,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } else { INT xc, yc; FT_Vector vec; + + left = right = 0; + for(xc = 0; xc < 2; xc++) { for(yc = 0; yc < 2; yc++) { vec.x = (ft_face->glyph->metrics.horiBearingX + @@ -4756,6 +4756,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMatUnrotated); adv = (vec.x+63) >> 6; } + + lsb = left >> 6; + bbx = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmptGlyphOrigin.x = left >> 6;

1 0

Maarten Lankhorst : quartz: Fix flushing in dsound renderer.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 3658bf2367e6054ebdf0dd584e09b464a9c1a58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3658bf2367e6054ebdf0dd584… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun May 30 19:17:26 2010 +0200 quartz: Fix flushing in dsound renderer. --- dlls/quartz/dsoundrender.c | 68 +++++++++++++++++++++++++++----------------- 1 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b327c00..8631cd5 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -72,6 +72,7 @@ typedef struct DSoundRenderImpl DWORD last_play_pos; DWORD play_loops; + DWORD in_loop; REFERENCE_TIME play_time; MediaSeekingImpl mediaSeeking; @@ -199,9 +200,20 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d buf_free = This->buf_size - This->write_pos + play_pos; /* Wait for enough of the buffer to empty before filling it */ - if(buf_free < This->buf_size/4) + if(buf_free < This->buf_size/20) { - Sleep(50); + DWORD ret; + This->in_loop = 1; + LeaveCriticalSection(&This->csFilter); + ret = WaitForSingleObject(This->blocked, 50); + if (ret != WAIT_TIMEOUT) + ERR("%x\n", ret); + EnterCriticalSection(&This->csFilter); + This->in_loop = 0; + if (This->pInputPin->flushing) + return VFW_E_WRONG_STATE; + if (This->state == State_Stopped) + return VFW_E_WRONG_STATE; continue; } @@ -296,8 +308,6 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) } } - SetEvent(This->state_change); - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { @@ -325,6 +335,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) if (This->state == State_Paused) { + SetEvent(This->state_change); LeaveCriticalSection(&This->csFilter); WaitForSingleObject(This->blocked, INFINITE); EnterCriticalSection(&This->csFilter); @@ -360,6 +371,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) #endif hr = DSoundRender_SendSampleData(This, pbSrcStream, cbSrcStream); + SetEvent(This->state_change); LeaveCriticalSection(&This->csFilter); return hr; } @@ -651,6 +663,7 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar ResetEvent(This->state_change); This->pInputPin->end_of_stream = 0; } + ResetEvent(This->blocked); This->state = State_Running; } @@ -964,16 +977,39 @@ static HRESULT WINAPI DSoundRender_InputPin_BeginFlush(IPin * iface) InputPin *This = (InputPin *)iface; DSoundRenderImpl *pFilter = (DSoundRenderImpl *)This->pin.pinInfo.pFilter; HRESULT hr; - LPBYTE buffer; - DWORD size; TRACE("\n"); EnterCriticalSection(This->pin.pCritSec); hr = InputPin_BeginFlush(iface); + SetEvent(pFilter->blocked); + LeaveCriticalSection(This->pin.pCritSec); + + return hr; +} + +static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface) +{ + InputPin *This = (InputPin *)iface; + DSoundRenderImpl *pFilter = (DSoundRenderImpl *)This->pin.pinInfo.pFilter; + HRESULT hr; + + TRACE("\n"); + + EnterCriticalSection(This->pin.pCritSec); + if (pFilter->in_loop) { + ResetEvent(pFilter->state_change); + LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(pFilter->state_change, -1); + EnterCriticalSection(This->pin.pCritSec); + } + if (pFilter->state != State_Stopped) + ResetEvent(pFilter->blocked); if (pFilter->dsbuffer) { + LPBYTE buffer; + DWORD size; IDirectSoundBuffer_Stop(pFilter->dsbuffer); /* Force a reset */ @@ -986,27 +1022,7 @@ static HRESULT WINAPI DSoundRender_InputPin_BeginFlush(IPin * iface) memset(buffer, 0, size); IDirectSoundBuffer_Unlock(pFilter->dsbuffer, buffer, size, NULL, 0); } - - if (pFilter->state == State_Paused) - SetEvent(pFilter->blocked); - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - -static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface) -{ - InputPin *This = (InputPin *)iface; - DSoundRenderImpl *pFilter = (DSoundRenderImpl *)This->pin.pinInfo.pFilter; - HRESULT hr; - - TRACE("\n"); - - EnterCriticalSection(This->pin.pCritSec); hr = InputPin_EndFlush(iface); - - if (pFilter->state == State_Paused) - SetEvent(pFilter->blocked); LeaveCriticalSection(This->pin.pCritSec); return hr;

1 0

Maarten Lankhorst : quartz: Accept tiny discontinuities in video renderer without printing out an error .
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: f830c544acf9ca11e2bf3fa57fed5844973f272e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f830c544acf9ca11e2bf3fa57… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 21:30:55 2010 +0200 quartz: Accept tiny discontinuities in video renderer without printing out an error. --- dlls/quartz/videorenderer.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 268373f..0af8cc6 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -367,9 +367,12 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); - if (This->rtLastStop != tStart) + if (This->rtLastStop != tStart && This->state == State_Running) { - if (IMediaSample_IsDiscontinuity(pSample) == S_FALSE) + LONG64 delta; + delta = tStart - This->rtLastStop; + if ((delta < -100000 || delta > 100000) && + IMediaSample_IsDiscontinuity(pSample) == S_FALSE) ERR("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", (DWORD)(This->rtLastStop / 10000000), (DWORD)((This->rtLastStop / 10000)%1000),

1 0

Maarten Lankhorst : quartz: Make it possible to just override IMediaSeeking ::GetCurrentPosition.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 9c07be439980bdd514b966cf1da85ef00451ae18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c07be439980bdd514b966cf1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 21:32:24 2010 +0200 quartz: Make it possible to just override IMediaSeeking::GetCurrentPosition. --- dlls/quartz/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 9a50737..f7c94a7 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -616,8 +616,8 @@ HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * p TRACE("(%p, %p)\n", pCurrent, pStop); EnterCriticalSection(This->crst); - *pCurrent = This->llCurrent; - *pStop = This->llStop; + IMediaSeeking_GetCurrentPosition(iface, pCurrent); + IMediaSeeking_GetStopPosition(iface, pStop); LeaveCriticalSection(This->crst); return S_OK;

1 0

Maarten Lankhorst : quartz: Implement MediaSeekingPassThru.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 5fbef396078a1b29643070148be4ca1071df128a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbef396078a1b29643070148… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 14:04:38 2010 +0200 quartz: Implement MediaSeekingPassThru. --- dlls/quartz/control.c | 230 +++++++++++++++++++++++++++++++----------------- 1 files changed, 148 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fbef396078a1b2964307…

1 0

Henri Verbeet : wined3d: Check for unread registers in a more logical way in handle_ps3_input().
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: ce39714228cc0d233206379290c9d2f0b30ad21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce39714228cc0d23320637929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 27 12:54:49 2010 +0200 wined3d: Check for unread registers in a more logical way in handle_ps3_input(). ~0U always >= (in_count + 2). --- dlls/wined3d/glsl_shader.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89bc6ac..7736065 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3757,13 +3757,11 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, const struct if (!(input_map & 1)) continue; in_idx = map[i]; - if (in_idx >= (in_count + 2)) { - FIXME("More input varyings declared than supported, expect issues\n"); - continue; - } - else if (map[i] == ~0U) + /* Declared, but not read register */ + if (in_idx == ~0U) continue; + if (in_idx >= (in_count + 2)) { - /* Declared, but not read register */ + FIXME("More input varyings declared than supported, expect issues.\n"); continue; }

1 0

Henri Verbeet : wined3d: Properly take both input and output masks into account in handle_ps3_input ().
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 0d25da0c0dae4eb9085197bddefa47a5e5d4bdcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d25da0c0dae4eb9085197bdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 27 12:54:50 2010 +0200 wined3d: Properly take both input and output masks into account in handle_ps3_input(). --- dlls/wined3d/glsl_shader.c | 102 ++++++++++++++++++-------------------------- 1 files changed, 41 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7736065..1eae835 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3733,12 +3733,12 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, const struct const struct wined3d_shader_signature_element *output_signature, const struct shader_reg_maps *reg_maps_out) { unsigned int i, j; - const char *semantic_name_in, *semantic_name_out; - UINT semantic_idx_in, semantic_idx_out; + const char *semantic_name_in; + UINT semantic_idx_in; DWORD *set; DWORD in_idx; unsigned int in_count = vec4_varyings(3, gl_info); - char reg_mask[6], reg_mask_out[6]; + char reg_mask[6]; char destination[50]; WORD input_map, output_map; @@ -3775,11 +3775,13 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, const struct semantic_name_in = input_signature[i].semantic_name; semantic_idx_in = input_signature[i].semantic_idx; - set[map[i]] = input_signature[i].mask; - shader_glsl_write_mask_to_str(input_signature[i].mask, reg_mask); + set[in_idx] = ~0U; if (!output_signature) { + shader_glsl_write_mask_to_str(input_signature[i].mask, reg_mask); + set[in_idx] = input_signature[i].mask; + if (shader_match_semantic(semantic_name_in, WINED3DDECLUSAGE_COLOR)) { if (semantic_idx_in == 0) @@ -3815,73 +3817,51 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, const struct shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", destination, reg_mask, reg_mask); } - } else { - BOOL found = FALSE; - + } + else + { output_map = reg_maps_out->output_registers; for (j = 0; output_map; output_map >>= 1, ++j) { - if (!(output_map & 1)) continue; + DWORD mask; - semantic_name_out = output_signature[j].semantic_name; - semantic_idx_out = output_signature[j].semantic_idx; - shader_glsl_write_mask_to_str(output_signature[j].mask, reg_mask_out); + if (!(output_map & 1) + || semantic_idx_in != output_signature[j].semantic_idx + || strcmp(semantic_name_in, output_signature[j].semantic_name) + || !(mask = input_signature[i].mask & output_signature[j].mask)) + continue; - if (semantic_idx_in == semantic_idx_out - && !strcmp(semantic_name_in, semantic_name_out)) - { - shader_addline(buffer, "%s%s = OUT[%u]%s;\n", - destination, reg_mask, j, reg_mask); - found = TRUE; - } - } - if(!found) { - shader_addline(buffer, "%s%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - destination, reg_mask, reg_mask); + set[in_idx] = mask; + shader_glsl_write_mask_to_str(mask, reg_mask); + + shader_addline(buffer, "%s%s = OUT[%u]%s;\n", + destination, reg_mask, j, reg_mask); } } } - /* This is solely to make the compiler / linker happy and avoid warning about undefined - * varyings. It shouldn't result in any real code executed on the GPU, since all read - * input varyings are assigned above, if the optimizer works properly. - */ - for(i = 0; i < in_count + 2; i++) { - if (set[i] && set[i] != WINED3DSP_WRITEMASK_ALL) - { - unsigned int size = 0; - memset(reg_mask, 0, sizeof(reg_mask)); - if(!(set[i] & WINED3DSP_WRITEMASK_0)) { - reg_mask[size] = 'x'; - size++; - } - if(!(set[i] & WINED3DSP_WRITEMASK_1)) { - reg_mask[size] = 'y'; - size++; - } - if(!(set[i] & WINED3DSP_WRITEMASK_2)) { - reg_mask[size] = 'z'; - size++; - } - if(!(set[i] & WINED3DSP_WRITEMASK_3)) { - reg_mask[size] = 'w'; - size++; - } + for (i = 0; i < in_count + 2; ++i) + { + unsigned int size; - if (i == in_count) { - sprintf(destination, "gl_FrontColor"); - } else if (i == in_count + 1) { - sprintf(destination, "gl_FrontSecondaryColor"); - } else { - sprintf(destination, "IN[%u]", i); - } + if (!set[i] || set[i] == WINED3DSP_WRITEMASK_ALL) + continue; - if (size == 1) { - shader_addline(buffer, "%s.%s = 0.0;\n", destination, reg_mask); - } else { - shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination, reg_mask, size); - } - } + if (set[i] == ~0U) set[i] = 0; + + size = 0; + if (!(set[i] & WINED3DSP_WRITEMASK_0)) reg_mask[size++] = 'x'; + if (!(set[i] & WINED3DSP_WRITEMASK_1)) reg_mask[size++] = 'y'; + if (!(set[i] & WINED3DSP_WRITEMASK_2)) reg_mask[size++] = 'z'; + if (!(set[i] & WINED3DSP_WRITEMASK_3)) reg_mask[size++] = 'w'; + reg_mask[size] = '\0'; + + if (i == in_count) sprintf(destination, "gl_FrontColor"); + else if (i == in_count + 1) sprintf(destination, "gl_FrontSecondaryColor"); + else sprintf(destination, "IN[%u]", i); + + if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination, reg_mask); + else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination, reg_mask, size); } HeapFree(GetProcessHeap(), 0, set);

1 0

Henri Verbeet : wined3d: Invalid NP2 fixup info is an internal error.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: ea2bb2a9042ce8d9f1e4cf6f717c9c45959b4f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2bb2a9042ce8d9f1e4cf6f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 27 12:54:51 2010 +0200 wined3d: Invalid NP2 fixup info is an internal error. --- dlls/wined3d/glsl_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1eae835..8ddbae0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -698,8 +698,9 @@ static void shader_glsl_load_np2fixup_constants( const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; GLfloat* tex_dim = &np2fixup_constants[(idx >> 1) * 4]; - if (!tex) { - FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); + if (!tex) + { + ERR("Nonexistent texture is flagged for NP2 texcoord fixup.\n"); continue; }

1 0